diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index f819702..2b569fd 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -99,7 +99,8 @@ body { box-shadow: 2px 2px 5px 3px #666; display: inline-block; - position: relative; + position: absolute; + top: 0; z-index: 50; -webkit-transition: background-color 0.5s ease; @@ -109,6 +110,7 @@ body { } #mainHeader h1, #mainHeader h2 { + font-size: 3.5vh; margin-left: 0.5%; padding: 0; height: 5.5vh; @@ -120,6 +122,7 @@ body { #mainHeader h2 { font-weight: 200; + font-size: 3vh; float: left; } @@ -227,23 +230,24 @@ input, textarea { #menuContainer, #optionsContainer { min-height: 100%; max-height: 100%; - width: 17%; + width: 250px; padding: 1% 0 1% 0; box-shadow: 2px 2px 5px 3px #666; position: absolute; + top: 6vh; z-index: 5; overflow: hidden; - -webkit-transition: margin 0.5s ease, background-color 0.5s ease; - -moz-transition: margin 0.5s ease, background-color 0.5s ease; - -ms-transition: margin 0.5s ease, background-color 0.5s ease; - transition: margin 0.5s ease, background-color 0.5s ease; + -webkit-transition: left 0.5s ease, right 0.5s ease, background-color 0.5s ease; + -moz-transition: left 0.5s ease, right 0.5s ease, background-color 0.5s ease; + -ms-transition: left 0.5s ease, right 0.5s ease, background-color 0.5s ease; + transition: left 0.5s ease, right 0.5s ease, background-color 0.5s ease; } #optionsContainer { - width: 12%; - padding: 1.5%; + width: 200px; + padding: 40px; right: 0; } @@ -379,17 +383,41 @@ input, textarea { #classesMode { width: 100%; - height: 100%; - display: inline-block; + height: 94vh; + + position: absolute; + top: 6vh; + right: 0; + bottom: 0; + left: 0; + + overflow-x: auto; + overflow-y: hidden; + white-space: nowrap; } .mainClass { - width: 18vw; - margin: 2%; - margin-right: 0; + width: 100%; + padding-bottom: 1%; box-shadow: 2px 2px 5px 3px #666; - float: left; +} + +.classWrapper { + width: 300px; + height: 100%; + margin: 10px; + margin-top: 20px; + display: inline-block; + vertical-align: top; +} + +.classWrapper:first-child { + margin-left: 20px; +} + +.classWrapper:last-child { + margin-right: 20px; } .classInfo { @@ -398,7 +426,9 @@ input, textarea { } .mainClassName { - font-size: 3.1vh; + font-size: 160%; + white-space: normal; + word-break: break-all; -webkit-filter: none; filter: none; @@ -428,15 +458,12 @@ input, textarea { } .workHolder { - width: 90%; - position: relative; - left: 5%; + width: 100%; } .workCard { - width: 100%; - margin-right: 0; - margin-bottom: 5%; + width: 90%; + margin: 2.5% 5% 2.5% 5%; background-color: rgba(255,255,255,0.3); box-shadow: 2px 2px 5px 3px #666; cursor: pointer; @@ -447,6 +474,14 @@ input, textarea { transition: box-shadow 0.4s ease, transform 0.3s ease; } +.workCard:first-child { + margin-top: 5%; +} + +.workCard:last-child { + margin-bottom: 5%; +} + .workCard:hover { box-shadow: 2px 2px 5px 3px #666, inset 0 0 0 99999px rgba(0,0,0,0.09); } @@ -517,14 +552,14 @@ input, textarea { } .workTitle, .prefTitle { - font-size: 2.7vh; + font-size: 200%; font-weight: 400; margin: 0 3% 1% 0; cursor: default; } .prefTitle { - font-size: 2.5vh; + font-size: 140%; margin-top: 5%; } @@ -722,17 +757,22 @@ input, textarea { } #bg { + min-width: 1920px; + min-height: 100%; width: 100%; - position: absolute; + height: auto; + + position: fixed; top: 0; left: 0; z-index: -1; + } #mainBody { width: 100%; height: 100%; - position: absolute; + position: relative; -webkit-transition: opacity 0.4s ease; -moz-transition: opacity 0.4s ease; @@ -1085,6 +1125,10 @@ input, textarea { bottom: 0; } +#toggleButtons div { + cursor: pointer; +} + #toggleButtons i { margin-right: 12%; @@ -1167,9 +1211,9 @@ input, textarea { #userDropdownAvatar img { width: 9vh; height: 9vh; - margin: -6.5vh 0 0 -5vh; + margin: -6.5vh 0 0 -5.25vh; - border: 3px solid #0D0D0D; + border: 0.5vh solid #0D0D0D; -moz-border-radius: 50%; -webkit-border-radius: 50%; border-radius: 50%; @@ -1180,9 +1224,10 @@ input, textarea { } #userDropdownAvatar p { + font-size: 2.4vh; width: 15vw; margin: 0 auto 0 auto; - padding-top: 12vh; + padding-top: 12.4vh; text-align: center; } @@ -1214,10 +1259,9 @@ input, textarea { } #requests { - width: 25vw; - height: 11vw; - margin-bottom: -15.5vw; - padding: 2vw; + width: 300px; + height: 170px; + padding: 30px; border-top: 5px solid #852E6D; box-shadow: -2px 0px 5px 1px #444; @@ -1228,31 +1272,31 @@ input, textarea { z-index: 30; - -webkit-transition: margin 0.4s ease; - -moz-transition: margin 0.4s ease; - -ms-transition: margin 0.4s ease; - transition: margin 0.4s ease; + -webkit-transition: bottom 0.4s ease; + -moz-transition: bottom 0.4s ease; + -ms-transition: bottom 0.4s ease; + transition: bottom 0.4s ease; } #requestTab { - width: 5vw; - height: 4vw; + width: 70px; + height: 50px; border-top: 5px solid #852E6D; box-shadow: -2px -4px 5px 0px #444; position: absolute; right: 0; - top: -4vw; + top: -55px; cursor: pointer; z-index: 15; } .fa-question { - font-size: 5vh; - width: 4vw; - padding: 5% 10% 10% 10%; + font-size: 36px; + width: 50px; + padding: 5px 10px 1px 10px; text-align: center; -webkit-transition: background-color 0.4s ease; @@ -1266,14 +1310,16 @@ input, textarea { } #requests p { + font-size: 80%; + font-weight: 400; margin: 0; margin-bottom: 1vh; } #requests textarea { width: 96%; - height: 11vh; - margin-bottom: 1.5vh; + height: 100px; + margin-bottom: 10px; } #requestCont{ @@ -1282,7 +1328,7 @@ input, textarea { #requestSubmit { font-weight: 200; - font-size: 2.5vh; + font-size: 20px; margin-right: 2%; padding: 2%; diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index f0496e1..f020f46 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -14,7 +14,7 @@
-