diff --git a/project/media/images/global-tabs-sep.png b/project/media/images/global-tabs-sep.png new file mode 100644 index 0000000..d7b3307 Binary files /dev/null and b/project/media/images/global-tabs-sep.png differ diff --git a/project/media/styles/authoring/_layout.scss b/project/media/styles/authoring/_layout.scss index 79515b5..63c6fb4 100644 --- a/project/media/styles/authoring/_layout.scss +++ b/project/media/styles/authoring/_layout.scss @@ -2,11 +2,13 @@ width: auto; margin: 0; padding: 30px; - background: none; font-family: "Myriad Pro", Helvetica, sans-serif; a { text-decoration: none; } + .column-main-container, .column-left-container { + border-right: none; + } } .column-left { section { diff --git a/project/media/styles/authoring/edit.css b/project/media/styles/authoring/edit.css index 82b2cea..8f2762b 100644 --- a/project/media/styles/authoring/edit.css +++ b/project/media/styles/authoring/edit.css @@ -2,10 +2,11 @@ width: auto; margin: 0; padding: 30px; - background: none; font-family: "Myriad Pro", Helvetica, sans-serif; } .layout-columns a { text-decoration: none; } + .layout-columns .column-main-container, .layout-columns .column-left-container { + border-right: none; } .column-left section { margin-bottom: 20px; } @@ -901,6 +902,10 @@ #step-write .layout-columns { padding-top: 3px; } +#step-write .column-left, #step-write .column-main { + left: 0; + overflow: visible; + position: static; } #step-write .column-left { padding-top: 30px; width: 250px; @@ -1311,7 +1316,10 @@ #step-describe .column-left, #step-describe .column-main, #step-describe .column-right { float: left; width: 30%; - margin-right: 20px; } + margin-right: 20px; + left: 0; + overflow: visible; + position: static; } #step-describe .column-left, #step-describe .column-main { margin-right: 20px; } #step-describe textarea, #step-describe input[type='text'], #step-describe .tagit.ui-widget-content { @@ -1382,6 +1390,10 @@ #step-submit .layout-columns { padding-top: 30px; } +#step-submit .column-left, #step-submit .column-main { + left: 0; + overflow: visible; + position: static; } #step-submit .column-left { width: 300px; } #step-submit .column-main { diff --git a/project/media/styles/authoring/edit.scss b/project/media/styles/authoring/edit.scss index 9ae8eda..d37b3ef 100644 --- a/project/media/styles/authoring/edit.scss +++ b/project/media/styles/authoring/edit.scss @@ -905,6 +905,11 @@ .layout-columns { padding-top: 3px; } + .column-left, .column-main { + left: 0; + overflow: visible; + position: static; + } .column-left { padding-top: 30px; width: 250px; @@ -1439,6 +1444,9 @@ float: left; width: 30%; margin-right: 20px; + left: 0; + overflow: visible; + position: static; } .column-left, .column-main { margin-right: 20px; @@ -1537,6 +1545,11 @@ .layout-columns { padding-top: 30px; } + .column-left, .column-main { + left: 0; + overflow: visible; + position: static; + } .column-left { width: 300px; } diff --git a/project/media/styles/authoring/view.css b/project/media/styles/authoring/view.css index 4afd950..02c287f 100644 --- a/project/media/styles/authoring/view.css +++ b/project/media/styles/authoring/view.css @@ -2,10 +2,11 @@ width: auto; margin: 0; padding: 30px; - background: none; font-family: "Myriad Pro", Helvetica, sans-serif; } .layout-columns a { text-decoration: none; } + .layout-columns .column-main-container, .layout-columns .column-left-container { + border-right: none; } .column-left section { margin-bottom: 20px; } diff --git a/project/media/styles/column-layout.css b/project/media/styles/column-layout.css index 9d03f13..a646931 100644 --- a/project/media/styles/column-layout.css +++ b/project/media/styles/column-layout.css @@ -1,26 +1,57 @@ .layout-columns { margin-top: 20px; - background: url(../images/columns-bg.gif) repeat-y 14.62em 0; +} + +.column-right-container { + clear:left; + float:left; + width:100%; + overflow:hidden; +} +.column-main-container { + clear:left; + float:left; + width:100%; + position:relative; + right:20%; + border-right: dotted 1px #B3B3B3; +} +.column-left-container { + float:left; + width:100%; + position:relative; + right:60%; + border-right: dotted 1px #B3B3B3; } .column-main { float: left; - padding: 0 20px; - width: 43.07em; + padding: 0 1.54em; + width: 58.33%; + position:relative; + left:80%; + overflow:hidden; } .column-left { float: left; - width: 13.85em; + width: 18.75%; + position:relative; + left:80%; + overflow:hidden; } .column-right { - float: right; - width: 13.85em; + float: left; + width: 18.75%; + position:relative; + left:80%; + overflow:hidden; } -body.no-columns .layout-columns { - background: none; +body.no-columns .column-main-container, +body.no-columns .column-left-container { + border-right: none; } body.no-columns .column-main { @@ -45,6 +76,7 @@ body.wide-right-column .column-left { body.wide-right-column .column-main { padding-left: 0; width: 51.54em; + border-right: none; } body.wide-right-column .column-right { @@ -57,8 +89,9 @@ body.no-right-column .column-left { width: 16.15em; } -body.no-right-column .layout-columns { - background: none; +body.no-right-column .column-main-container, +body.no-right-column .column-left-container { + border-right: none; } body.no-right-column .column-right { diff --git a/project/media/styles/header.css b/project/media/styles/header.css index 9c7da0b..6e10494 100644 --- a/project/media/styles/header.css +++ b/project/media/styles/header.css @@ -71,29 +71,17 @@ body.authenticated header.global nav li.anon { background: url(../images/logo.png) no-repeat; } .global-tabs { - margin-bottom: 1em; - border-bottom: 1pt solid #CCCCCC; - /* Old browsers */ - background: #E6E6E6; - /* FF3.6+ */ - background: -moz-linear-gradient(top, #e6e6e6 0%, #f2f2f2 50%, #f2f2f2 51%, #e6e6e6 100%); - /* Chrome,Safari4+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e6e6e6), color-stop(50%, #f2f2f2), color-stop(51%, #f2f2f2), color-stop(100%, #e6e6e6)); - /* Chrome10+,Safari5.1+ */ - background: -webkit-linear-gradient(top, #e6e6e6 0%, #f2f2f2 50%, #f2f2f2 51%, #e6e6e6 100%); - /* IE7 - 9 */ - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#e6e6e6', endColorstr='#f2f2f2'); - /* IE10+ */ - background: -ms-linear-gradient(top, #e6e6e6 0%, #f2f2f2 50%, #f2f2f2 51%, #e6e6e6 100%); - /* W3C */ - background: linear-gradient(top, #e6e6e6 0%, #f2f2f2 50%, #f2f2f2 51%, #e6e6e6 100%); } + background: url(../images/global-tabs-bg.png) repeat-x; + margin-bottom: 1em; } .global-tabs ul { list-style-type: none; - display: inline-block; } + display: inline-block; + padding-right: 4px; + background: url(../images/global-tabs-sep.png) 100% 0 no-repeat; } .global-tabs li { display: inline-block; - border: 1pt solid #D9D9D9; - box-shadow: 1pt 0 0 #FFFFFF; } + background: url(../images/global-tabs-sep.png) 1px 0 no-repeat; + padding-left: 3px; } .global-tabs li a { display: block; padding: 0 1em; @@ -229,13 +217,10 @@ body.authenticated header.global nav li.anon { .fl-theme-uio-yb .global-tabs nav li.selected a, .fl-theme-uio-wb .global-tabs nav li.selected a { - color: #000000 !important; - text-shadow: none; } + color: #000000 !important; } .fl-theme-uio-by .global-tabs nav li.selected a { - color: #FFFF00 !important; - text-shadow: none; } + color: #FFFF00 !important; } .fl-theme-uio-bw .global-tabs nav li.selected a { - color: #FFFFFF !important; - text-shadow: none; } + color: #FFFFFF !important; } diff --git a/project/media/styles/header.scss b/project/media/styles/header.scss index 51ca694..b6f895e 100644 --- a/project/media/styles/header.scss +++ b/project/media/styles/header.scss @@ -92,30 +92,18 @@ body.authenticated header.global nav li.anon { } .global-tabs { + background: url(../images/global-tabs-bg.png) repeat-x; margin-bottom: 1em; - border-bottom: 1pt solid #CCCCCC; - /* Old browsers */ - background: #E6E6E6; - /* FF3.6+ */ - background: -moz-linear-gradient(top, #E6E6E6 0%, #F2F2F2 50%, #F2F2F2 51%, #E6E6E6 100%); - /* Chrome,Safari4+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E6E6E6), color-stop(50%,#F2F2F2), color-stop(51%,#F2F2F2), color-stop(100%,#E6E6E6)); - /* Chrome10+,Safari5.1+ */ - background: -webkit-linear-gradient(top, #E6E6E6 0%,#F2F2F2 50%,#F2F2F2 51%,#E6E6E6 100%); - /* IE7 - 9 */ - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#e6e6e6', endColorstr='#f2f2f2'); - /* IE10+ */ - background: -ms-linear-gradient(top, #E6E6E6 0%,#F2F2F2 50%,#F2F2F2 51%,#E6E6E6 100%); - /* W3C */ - background: linear-gradient(top, #E6E6E6 0%,#F2F2F2 50%,#F2F2F2 51%,#E6E6E6 100%); ul { list-style-type: none; display: inline-block; + padding-right: 4px; + background: url(../images/global-tabs-sep.png) 100% 0 no-repeat; } li { display: inline-block; - border: 1pt solid #D9D9D9; - box-shadow: 1pt 0 0 #FFFFFF; + background: url(../images/global-tabs-sep.png) 1px 0 no-repeat; + padding-left: 3px; a { display: block; padding: 0 1em; @@ -271,13 +259,11 @@ body.authenticated header.global nav li.anon { .fl-theme-uio-yb .global-tabs nav li.selected a, .fl-theme-uio-wb .global-tabs nav li.selected a { color: #000000 !important; - text-shadow: none; } .fl-theme-uio-by .global-tabs nav li.selected a { color: #FFFF00 !important; - text-shadow: none; } .fl-theme-uio-bw .global-tabs nav li.selected a { color: #FFFFFF !important; - text-shadow: none; } + diff --git a/project/media/styles/materials.css b/project/media/styles/materials.css index d16151b..bc0b85c 100644 --- a/project/media/styles/materials.css +++ b/project/media/styles/materials.css @@ -408,8 +408,9 @@ clear: left; } -body.wide-right-column.view-item .layout-columns { - background: none; +body.wide-right-column.view-item .layout-columns .column-main-container, +body.wide-right-column.view-item .layout-columns .column-left-container { + border-right: none; } diff --git a/project/media/styles/myitems.css b/project/media/styles/myitems.css index 8da67f4..41cbf23 100644 --- a/project/media/styles/myitems.css +++ b/project/media/styles/myitems.css @@ -550,7 +550,11 @@ dl.user-info dt { padding: 40px 30px 20px 30px; margin-top: -2px; margin-bottom: -2px; - background: none; +} + +.with-profile-tabs .layout-columns .column-main-container, +.with-profile-tabs .layout-columns .column-left-container { + border-right: none; } .with-profile-tabs footer { diff --git a/project/media/styles/profile.css b/project/media/styles/profile.css index 4328e47..48c6fa0 100644 --- a/project/media/styles/profile.css +++ b/project/media/styles/profile.css @@ -1,21 +1,22 @@ -.profile-view .layout-columns { - background: none; +.profile-view .layout-columns .column-main-container, +.profile-view .layout-columns .column-left-container { + border-right: none; } .profile-view .column-left { - width: 400px; + width: 30.77em; } .profile-view .column-right { display: none; } .profile-edit .column-left { - width: 140px; + width: 10.77em; } .profile-edit .column-main { padding-left: 30px; - width: 770px; + width: 59.23em; } .profile-edit .column-right { @@ -57,7 +58,7 @@ } .profile-view .column-main { - width: 540px; + width: 41em; padding-right: 0; } diff --git a/project/templates/base.html b/project/templates/base.html index 2b0d7f4..baaeaa7 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -63,6 +63,10 @@ {% block layout-columns-title %}{% endblock %} +