From 4eac4ccd7a48b27497358458feb22e4c7d5c54ac Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Fri, 28 Aug 2015 13:30:32 -0500 Subject: [PATCH] VRFS-3359 : Style updates, mostly for experience page. --- .../client/react-components/Profile.css.scss | 33 ++++++++-- .../stylesheets/client/teachers.css.scss | 64 +++++++++++++++++-- 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/web/app/assets/stylesheets/client/react-components/Profile.css.scss b/web/app/assets/stylesheets/client/react-components/Profile.css.scss index 03be6b408..f590d8846 100644 --- a/web/app/assets/stylesheets/client/react-components/Profile.css.scss +++ b/web/app/assets/stylesheets/client/react-components/Profile.css.scss @@ -2,23 +2,42 @@ @import "client/screen_common.css.scss"; .react-component { - .checkbox-scroller { + width: 100%; + em { + font-style: italic; + } + + .checkbox-scroller, .editable-scroller { overflow-x: hidden; - overflow-y: auto; + overflow-y: scroll; + //position: relative; width: 100%; - min-height: 10em; + + // min-height: 10em; + // max-height: 20em; @include border_box_sizing; text-align:left; - border-right: 1px solid #4c4c4c; - margin-bottom:10px; - margin-top:10px; + //border-right: 1px solid #4c4c4c; + margin-bottom:2em; + margin-top:2em; + padding: 0.25em; + } + + .editable-scroller { + border: 2px solid #c5c5c5; + color: #c5c5c5; + height: 10em; + } + + .checkbox-scroller { background-color: #c5c5c5; + height: 15em; .checkItem { clear: both; label { color: black; display: inline; - float: left; + float: left; font-size: 1em; } input { diff --git a/web/app/assets/stylesheets/client/teachers.css.scss b/web/app/assets/stylesheets/client/teachers.css.scss index c5b471743..d57fcc9af 100644 --- a/web/app/assets/stylesheets/client/teachers.css.scss +++ b/web/app/assets/stylesheets/client/teachers.css.scss @@ -3,6 +3,25 @@ .teacher-setup { font-family: Raleway, Arial, Helvetica, verdana, arial, sans-serif; + + .TeacherSetupComponent { + @include border_box_sizing; + //float: left; + position: relative; + //clear: both; + height: 100%; + .TeacherSetupNav { + clear: both; + @include border_box_sizing; + float: left; + // margin-top:90%; + // position: absolute; + // bottom: 40px; + // right: 40px; + + } + } + .teacher-setup-form { padding: 1em; .error-text { @@ -22,6 +41,32 @@ @extend .w25; } + .teacher-third-column { + @include border_box_sizing; + width: 33%; + float: left; + padding-right: 1em; + } + + + table.form-table { + width: 100%; + margin-bottom: 1em; + label, input, select { + width: 100%; + margin: 4px 4px 4px 0px; + } + + .inline-fields { + display: inline; + label, input, select { + display: inline; + width: auto; + } + } + + } + .teacher-field { padding: 1em; @include border_box_sizing; @@ -56,20 +101,31 @@ //padding: 5px; } } + + + + } + + + + label { font-size: 1.05em; } - .TeacherSetupNav { - clear: both; - float: right; - } label.strong-label { font-weight: bold; font-size: 1.1em; } + label.sub-caption { + font-weight: normal; + font-size: 1.0em; + margin: 8px 4px 8px 0px; + text-transform: uppercase; + } + } \ No newline at end of file