diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index bc2fc2e..a70ed24 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -130,6 +130,9 @@ h4 { input, textarea { font-family: 'Raleway'; + background-color: #FEFEFE; + border: 3px solid #FEFEFE; + border-radius: 3px; resize: none; } diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css index b055dfa..38b3c8b 100644 --- a/hourglass/client/profile/profile.css +++ b/hourglass/client/profile/profile.css @@ -16,7 +16,7 @@ } .profTitle { - font-size: 150%; + font-size: 3vh; font-weight: 400; margin: 0; margin-bottom: 1%; @@ -24,7 +24,7 @@ } .profHea { - font-size: 300; + font-size: 5.5vh; font-weight: 200; padding: 6% 6% 0 8%; } @@ -155,12 +155,10 @@ #cardColLeft { width: 39.6%; - float: left; } #cardColRight { width: 60%; - float: right; } .card { @@ -324,13 +322,17 @@ background-color: #138686; } +#joinTop .fa-search { + font-size: 2.5vh; + margin-right: 3%; +} + #private { - margin: 3% 35% 0 4%; + margin-left: 5%; padding: 1.5%; background-color: rgba(0,0,0,0.2); - float: right; cursor: pointer; -webkit-transition: background-color 0.4s ease; @@ -404,7 +406,7 @@ } .creInput { - font-size: 120%; + font-size: 2vh; padding: 3%; } @@ -420,8 +422,9 @@ #creSubmit { font-weight: 200; - font-size: 140%; - margin: 0 35% 0 35%; + font-size: 3vh; + width: 13vw; + margin: auto; padding: 2%; background-color: rgba(0,0,0,0.25); @@ -668,16 +671,16 @@ } #joinPrivClass { - width: 18%; + width: 18vw; margin-bottom: -20%; padding: 1.5%; - padding-bottom: 2%; + padding-bottom: 1%; border-top: 5px solid #852E6D; box-shadow: -2px 0px 5px 1px #444; position: absolute; - right: 5%; + right: 5vw; bottom: 0; -webkit-transition: margin 0.4s ease; @@ -689,19 +692,23 @@ #joinPrivClass h3 { font-weight: 400; font-size: 150%; - margin-bottom: 3%; + margin-bottom: 1vh; } #privateCode { - font-size: 130%; + font-size: 3vh; + width: 93%; + margin-top: 1%; + margin-bottom: 1vh; padding: 1%; } #privSubmit { - font-size: 120%; + font-size: 2vh; margin-left: 5%; padding: 3%; background-color: rgba(0,0,0,0.2); + float: right; cursor: pointer; -webkit-transition: background-color 0.2s ease; diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html index 7cdd740..bb35e29 100644 --- a/hourglass/client/profile/profile.html +++ b/hourglass/client/profile/profile.html @@ -129,9 +129,11 @@ {{/if}} {{#if profClassTab "addClass"}} - - {{> inputAutocomplete id="profClassSearch" settings=classSettings placeholder="Search..."}} -