From 41b27de12e4007db0c809664a8b2491a98972c25 Mon Sep 17 00:00:00 2001 From: Kim Nguyen Date: Tue, 13 Sep 2016 14:56:52 -0400 Subject: [PATCH] Replace image borders with solid colors, fix line-endings in css. --- admin/themes/default/css/media/767max.css | 91 +++++++++---------- admin/themes/default/css/style.css | 14 +-- .../views/scripts/css/media/767max.css | 60 ++++++------ application/views/scripts/css/style.css | 13 +-- install/screen.css | 84 ++++++++--------- 5 files changed, 115 insertions(+), 147 deletions(-) diff --git a/admin/themes/default/css/media/767max.css b/admin/themes/default/css/media/767max.css index b969744306..0e36fced12 100644 --- a/admin/themes/default/css/media/767max.css +++ b/admin/themes/default/css/media/767max.css @@ -7,7 +7,7 @@ #Site-Wide Search #Browse Items #Show ITems - #Login + #Login #Browse Themes*/ @@ -25,55 +25,50 @@ header nav { float: left; } header ul { margin: .375em 0 0 0; } #user-nav { clear: left; } - + /* Tables ==================================================*/ .even th { background-color: #B1A584; border: 0; } - + .odd th { background-color: #D3D0B5; border: 0; } th a:after, th.desc a:after, th.asc a:after { content: ""; } - -/* Content Navigation + +/* Content Navigation ================================================== */ #content-nav { font-size: .75em;} - - #content-nav ul { display: none; } + + #content-nav ul { display: none; } #mobile-content-nav { display: block; } #section-nav { - -webkit-border-image: url('../../images/red-bg.jpg') 5 repeat; - -moz-border-image: url('../../images/red-bg.jpg') 5 repeat; - -o-border-image: url('../../images/red-bg.jpg') 5 repeat; - border-image: url('../../images/red-bg.jpg') 5 repeat; - border: solid #9d5b41; - border-width: .375em 0 0 0; + border: .375em solid #9d5b41; margin: 0 0 16px 0; - border-width: .375em 0; + border-width: .375em 0; margin: 0 0 24px 0; padding-bottom: 10px; } -#section-nav ul { - padding: 0 0 10px 0; +#section-nav ul { + padding: 0 0 10px 0; margin: 0; } #section-nav li:first-child a { padding: 10px 15px 0 0; } #section-nav li.active:first-child a, - #section-nav li.current:first-child a, + #section-nav li.current:first-child a, #section-nav li:first-child a.active, #section-nav a { padding: 10px 15px 0 0; } #section-nav .active a, - #section-nav .current a, + #section-nav .current a, #section-nav a.active { background-image: none; -webkit-box-shadow: none; @@ -96,25 +91,25 @@ th a:after, th.desc a:after, th.asc a:after { content: ""; } padding: 0; } -.section-title { +.section-title { width: 100%; clear: left; - margin: 40px 0 20px 0; + margin: 40px 0 20px 0; } #search { width: 100%; float: left; margin: 10px 0; - position: relative; + position: relative; } #search input[type=text] { width: 80%; } #search input[type=submit] { width: 20%; } - -.subhead { + +.subhead { width: 100%; - display: inline-block; + display: inline-block; } /* Site-Wide Search @@ -124,41 +119,41 @@ th a:after, th.desc a:after, th.asc a:after { content: ""; } /* Browse Items ==================================================*/ - + .add-item { float: left; } - + .browse-items #advanced-search-link { float: left; margin-bottom: 20px; } - + .batch-edit-heading, .batch-edit-check { display: none; } - + .browse-items .filters { clear: both; } - + .browse-items #filter-list { margin: 0; } - .browse-items .pagination { - width: 100%; + .browse-items .pagination { + width: 100%; clear:both; float: none; overflow: auto; } - - .browse-items .pagination li { - display: inline-block; + + .browse-items .pagination li { + display: inline-block; margin: 0 5px 0 0; } - + .table-actions { width: 100%; font-size: .875em; margin-bottom: 20px; } - + .items-browse { text-align: center; float: left; margin: 0; } - + .table-actions a.button, .table-actions input[type=submit] { height: auto !important; background: #fff; @@ -179,42 +174,42 @@ th a:after, th.desc a:after, th.asc a:after { content: ""; } -moz-box-sizing: border-box; box-sizing: border-box; } - + .table-actions a.button:first-child, .table-actions input[type=submit]:first-child { border-top-left-radius: 3px; border-top-right-radius: 3px; } - + .table-actions a.button:last-of-type, .table-actions input[type=submit]:last-of-type { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; border-bottom: 1px solid #E4E5DE; } - + .quick-filter-wrapper, .quick-filter-wrapper li, .quick-filter-wrapper a { width: 100%; } - + .quick-filter-wrapper { margin: 1em 0;} /* Show Items ==================================================*/ #item-images div:nth-of-type(3) { margin-right: 0; } - + #item-images div:nth-of-type(4) { margin-right: 20px; } /* Login ==================================================*/ - + .login-content h1 { font-size: 24px; } - + .login-content .inputs { margin: 0 0 20px 0; } - + #username-label, #password-label { text-align: left; } - - + + /* Browse Themes ==================================================*/ @@ -223,5 +218,5 @@ th a:after, th.desc a:after, th.asc a:after { content: ""; } .themes .theme .crop { height: 261px; } .themes .theme { margin-bottom: 40px; } - + .themes .group .theme { height: auto; } diff --git a/admin/themes/default/css/style.css b/admin/themes/default/css/style.css index 922ed2f56d..72f005ada6 100644 --- a/admin/themes/default/css/style.css +++ b/admin/themes/default/css/style.css @@ -533,12 +533,7 @@ img { border: 0; } header { width: 100%; background-color: #2A2520; - border: solid #9d5b41; - -webkit-border-image: url('../images/red-bg.jpg') 5 repeat; - -moz-border-image: url('../images/red-bg.jpg') 5 repeat; - -o-border-image: url('../images/red-bg.jpg') 5 repeat; - border-image: url('../images/red-bg.jpg') 5 repeat; - border-width: 0 0 .375em 0; + border-bottom: .375em solid #9d5b41; -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,.35); -moz-box-shadow: 1px 1px 2px rgba(0,0,0,.35); box-shadow: 0px 0px 5px #666666; @@ -1129,12 +1124,7 @@ header nav { #content { background-image: url('../images/content_bg.jpg'); - border: solid #9d5b41; - -webkit-border-image: url('../images/red-bg.jpg') 5 repeat; - -moz-border-image: url('../images/red-bg.jpg') 5 repeat; - -o-border-image: url('../images/red-bg.jpg') 5 repeat; - border-image: url('../images/red-bg.jpg') 5 repeat; - border-width: 5px 0 0 0; + border-top: 5px solid #9d5b41; -webkit-box-shadow: 0 0 1px #999999; -moz-box-shadow: 0 0 1px #999999; box-shadow: 0 0 1px #999999; diff --git a/application/views/scripts/css/media/767max.css b/application/views/scripts/css/media/767max.css index 5d6a044008..28c8a9d3de 100644 --- a/application/views/scripts/css/media/767max.css +++ b/application/views/scripts/css/media/767max.css @@ -20,7 +20,7 @@ header nav { float: left; } header ul { margin: .375em 0 0 0; } #user-nav { clear: left; } - + /* Tables ==================================================*/ @@ -31,30 +31,26 @@ header nav { float: left; } .mobile th { width: 1%; } - + .even th { background-color: #B1A584; border: 0; } - + .odd th { background-color: #D3D0B5; border: 0; } - -/* Content Navigation + +/* Content Navigation ================================================== */ #content-nav { font-size: .75em;} - - #content-nav ul { display: none; } -#mobile-content-nav { - display: block; + #content-nav ul { display: none; } + +#mobile-content-nav { + display: block; margin-top: 100px; } #section-nav { - -webkit-border-image: url('../../images/red-bg.jpg') 5 repeat; - -moz-border-image: url('../../images/red-bg.jpg') 5 repeat; - -o-border-image: url('../../images/red-bg.jpg') 50 repeat; - border-image: url('../../images/red-bg.jpg') 5 repeat; - border-width: .375em 0 0 0; + border-top: .375em solid #9d5b41; margin: 0 0 16px 0; } @@ -78,65 +74,65 @@ header nav { float: left; } /* Browse Items ==================================================*/ - + .add-item { float: left; } - + .browse-items #advanced-search-link { float: left; margin-bottom: 20px; } - + .batch-edit-heading, .batch-edit-check { display: none; } - + .browse-items .filters { clear: both; } - + .browse-items #filter-list { margin: 10px 0; } - .browse-items .pagination { - width: 100%; + .browse-items .pagination { + width: 100%; clear:both; float: none; } - - .browse-items .pagination li { - display: inline-block; + + .browse-items .pagination li { + display: inline-block; margin: 0 5px 0 0; } - + .item-actions { width: 100%; font-size: .875em; display: none; } - + .items-browse { text-align: center; float: left; margin: 0; } - + .item-actions a.button, .item-actions input[type=submit] { float: none; margin: 0 !important; } - + .quick-filter-wrapper, .quick-filter-wrapper li, .quick-filter-wrapper a { width: 100%; } - + .quick-filter-wrapper { margin: 1em 0;} /* Login ==================================================*/ - + .login-content h1 { font-size: 24px; } - + .login-content .inputs { margin: 0 0 20px 0; } - + #username-label, #password-label { text-align: left; } \ No newline at end of file diff --git a/application/views/scripts/css/style.css b/application/views/scripts/css/style.css index debf9a0234..64609a4b4b 100644 --- a/application/views/scripts/css/style.css +++ b/application/views/scripts/css/style.css @@ -460,11 +460,7 @@ p, li { header { width: 100%; background-color: #2A2520; - -webkit-border-image: url('../images/red-bg.jpg') 5 repeat; - -moz-border-image: url('../images/red-bg.jpg') 5 repeat; - -o-border-image: url('../images/red-bg.jpg') 5 repeat; - border-image: url('../images/red-bg.jpg') 5 repeat; - border-width: 0 0 .375em 0; + border-bottom: .375em solid #9d5b41; -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,.35); -moz-box-shadow: 1px 1px 2px rgba(0,0,0,.35); -o-box-shadow: 1px 1px 2px rgba(0,0,0,.35); @@ -810,10 +806,6 @@ header nav { #content { background-image: url('../images/content_bg.jpg'); - -webkit-border-image: url('../images/red-bg.jpg') 5 repeat; - -moz-border-image: url('../images/red-bg.jpg') 5 repeat; - -o-border-image: url('../images/red-bg.jpg') 50 repeat; - border-image: url("../images/red-bg.jpg") 5 / 0.375em 0 0 repeat; -webkit-box-shadow: 0 0 1px #999999; -moz-box-shadow: 0 0 1px #999999; -o-box-shadow: 0 0 1px #999999; @@ -821,8 +813,7 @@ header nav { margin-top: 10%; margin-bottom: 10%; padding: 20px 10px; - border: solid #9d5b41; - border-width: 5px 0 0 0; + border: 5px solid #9d5b41; } #content h1:first-child, #content h2:first-child { diff --git a/install/screen.css b/install/screen.css index 5095614bf5..9b7a3406c8 100644 --- a/install/screen.css +++ b/install/screen.css @@ -1,6 +1,6 @@ /* Table of Contents ================================================== - #Basic Styles + #Basic Styles #Form Elements #Content */ @@ -41,7 +41,7 @@ h1 { display: inline-block; float: left; } - + h1:after { height: 53px; width: 27px; @@ -51,27 +51,27 @@ h1 { float: right; } -h2 { +h2 { font-size: 21px; text-align: center; } - + h3 { font-size: 21px; font-weight: normal; } - + h4 { font-size: 16px; } - + h5 { font-family: "Arvo", serif; } a:link { color: #B86644; text-decoration: none; } - + a:hover, a:active { color: #E57F52; } - + a:visited { color: #A28E8A; } p, li { @@ -107,11 +107,11 @@ ol { padding: 0 0 0 20px; } font-size: 16px; line-height: 32px; margin: 10px auto; - padding: 0 10px; + padding: 0 10px; text-align: center; text-shadow: -1px -1px 1px rgba(0,0,0,.5); } - + a.button.blue, input[type=submit].blue, button.blue { background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#22546b), color-stop(100%,#102d3b)); background: -moz-linear-gradient(center top, #22546b 0%, #102d3b 100%); @@ -122,7 +122,7 @@ ol { padding: 0 0 0 20px; } } form, fieldset { border: 0; } - + fieldset:first-child { margin: 0 0 20px 0; } input[type="checkbox"] { @@ -148,28 +148,28 @@ ol { padding: 0 0 0 20px; } margin: 0; padding: 5px 10px; } - + input[type=text].big { font-size: 14px; padding: .375em; } - + input[type=text].small { font-size: 14px; padding: 0; } - legend { + legend { width: 100%; font-size: 1.125em; font-weight: bold; - padding: 0 0 20px 0; - margin: 0 0 10px 0; + padding: 0 0 20px 0; + margin: 0 0 10px 0; text-align: center; border-bottom: 1px dotted #c7c7c7; } - + textarea { height: 100px; border: 1px solid #d8d8d8; @@ -187,13 +187,13 @@ ol { padding: 0 0 0 20px; } font-size: 14px; padding: 5px 10px; } - + .explanation { clear: both; font-style: italic; margin-top: 0; } - + .field { clear: both; margin: 0 0 10px 0; @@ -206,7 +206,7 @@ ol { padding: 0 0 0 20px; } overflow: hidden; clear: both; } - + .field label { clear: left; font-size: 14px; @@ -214,21 +214,21 @@ ol { padding: 0 0 0 20px; } float: left; margin: 0; } - + .field select { min-width: 100%; margin-bottom: 10px; } - + .inputs { margin: 0 0 20px 0; } - + .inputs select { margin-top: 0; } - - + + .inputs input[type=text], .inputs input[type=password], .inputs textarea { width: 100%; box-sizing: border-box; @@ -236,18 +236,18 @@ ol { padding: 0 0 0 20px; } -moz-box-sizing: border-box; -o-box-sizing: border-box; } - + .inputs inputs a.button, .inputs input[type="submit"], .inputs button { margin-bottom: 10px; } #required-note { - font-size: 0.6em; - color: #777; + font-size: 0.6em; + color: #777; display: block; line-height: 2em; } - + .required:after { content: "*"; } @@ -258,42 +258,38 @@ ol { padding: 0 0 0 20px; } header { text-align: center; } -#content { +#content { background-image: url('images/content_bg.jpg'); - border-image: url('images/red-bg.jpg') 5 repeat; - -webkit-border-image: url('images/red-bg.jpg') 5 repeat; - -moz-border-image: url('images/red-bg.jpg') 5 repeat; - -o-border-image: url('images/red-bg.jpg') 50 repeat; - border-width: .375em 0 0 0; - box-shadow: 0 0 1px #999999; - -webkit-box-shadow: 0 0 1px #999999; - -moz-box-shadow: 0 0 1px #999999; - -o-box-shadow: 0 0 1px #999999; + border-top: .375em solid #9d5b41; + box-shadow: 0 0 1px #999999; + -webkit-box-shadow: 0 0 1px #999999; + -moz-box-shadow: 0 0 1px #999999; + -o-box-shadow: 0 0 1px #999999; margin-top: 10%; - margin-bottom: 10%; + margin-bottom: 10%; padding: 20px 10px; } /* Alerts ================================================== */ - + #content #flash ul, ul.error { list-style-type: none; margin-top: 20px; padding: 0; } - + #content #flash li, ul.error li { background-color: rgba(255, 255, 255, .5); border: 1px solid #E7E7E7; border-radius: 3px; font-size: 14px; margin-bottom: 20px; - padding: .5em; + padding: .5em; } .error, .alert { color: #914E33; } .fatal, .installed { text-align: center; } - + .success { color: #729108; }