Skip to content

Commit

Permalink
Replace image borders with solid colors, fix line-endings in css.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kimisgold
kimisgold committed Sep 13, 2016
1 parent 1906992 commit 41b27de
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 147 deletions.
91 changes: 43 additions & 48 deletions admin/themes/default/css/media/767max.css
View file
Expand Up @@ -7,7 +7,7 @@
#Site-Wide Search
#Browse Items
#Show ITems
#Login
#Login
#Browse Themes*/


Expand All @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand All @@ -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
==================================================*/

Expand All @@ -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; }
14 changes: 2 additions & 12 deletions admin/themes/default/css/style.css
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
60 changes: 28 additions & 32 deletions application/views/scripts/css/media/767max.css
View file
Expand Up @@ -20,7 +20,7 @@ header nav { float: left; }
header ul { margin: .375em 0 0 0; }

#user-nav { clear: left; }

/* Tables
==================================================*/

Expand All @@ -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;
}

Expand All @@ -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;
}

2 comments on commit 41b27de

@zerocrates
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to do the same to the other uses of red-bg.jpg?

@kimisgold
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was the original intent, but I had missed the section nav usage. Fixed in 61da66f.

Please sign in to comment.