Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.7] Isis Flat Repaint - Minor Fixes #12349

Merged
merged 7 commits into from
Oct 13, 2016
Merged

[3.7] Isis Flat Repaint - Minor Fixes #12349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f74946f
Removed text shadow
ciar4n Oct 7, 2016
f104019
Remove text-shadow
ciar4n Oct 7, 2016
cd93479
Modal save mouseover fix
ciar4n Oct 8, 2016
9712edb
Changed to individual removal of text-shadow
ciar4n Oct 8, 2016
90331f5
sidebar-nav margin fix
ciar4n Oct 8, 2016
04a05c9
Fix hover color on all BS btn
ciar4n Oct 8, 2016
bcfaf6f
Re-align permissions chzn
ciar4n Oct 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 39 additions & 4 deletions administrator/templates/isis/css/template-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2333,6 +2333,7 @@ input[type="button"].btn-block {
.btn-warning:hover,
.btn-warning:focus {
background-color: #ad6704;
color: #fff;
text-decoration: none;
text-shadow: none;
}
Expand All @@ -2345,6 +2346,7 @@ input[type="button"].btn-block {
.btn-danger:hover,
.btn-danger:focus {
background-color: #802420;
color: #fff;
text-decoration: none;
}
.btn-success {
Expand All @@ -2356,6 +2358,7 @@ input[type="button"].btn-block {
.btn-success:hover,
.btn-success:focus {
background-color: #2f6f2f;
color: #fff;
text-decoration: none;
}
.btn-info {
Expand All @@ -2367,6 +2370,7 @@ input[type="button"].btn-block {
.btn-info:hover,
.btn-info:focus {
background-color: #1f6377;
color: #fff;
text-decoration: none;
}
.btn-inverse {
Expand All @@ -2378,6 +2382,7 @@ input[type="button"].btn-block {
.btn-inverse:hover,
.btn-inverse:focus {
background-color: #1e1e1e;
color: #fff;
text-decoration: none;
}
button.btn,
Expand Down Expand Up @@ -7632,8 +7637,8 @@ h6 {
.sidebar-nav .nav-list > li > a {
color: #555;
padding: 3px 25px;
margin-left: -25px;
margin-right: -25px;
margin-left: -26px;
margin-right: -26px;
}
.sidebar-nav .nav-list > li.active > a {
color: #fff;
Expand Down Expand Up @@ -8008,8 +8013,8 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
vertical-align: baseline;
}
.j-jed-message {
line-height: 2em;
color: #333333;
line-height: 2em;
color: #333333;
}
.form-horizontal .control-label {
width: auto;
Expand Down Expand Up @@ -8199,8 +8204,12 @@ th .tooltip-inner {
}
/* Permissions dropdown display */
#permissions-sliders .chzn-container {
margin-top: -5px;
position: absolute;
}
#permissions-sliders .table td {
padding: 8px 8px 9px;
}
/* Component pop-up */
.container-popup {
padding: 28px 10px 10px 10px;
Expand Down Expand Up @@ -8580,6 +8589,32 @@ body.modal-open {
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
/* Removes Text Shadows */
.alert,
.alert-options,
.badge,
.breadcrumb > li,
.close,
.input-append .add-on,
.input-prepend .add-on,
.label,
.nav-header,
.nav-list .nav-header,
.nav-list > .active > a,
.nav-list > .active > a:focus,
.nav-list > .active > a:hover,
.nav-list > li > a,
.nav-tabs.nav-dark,
.navbar .brand,
.navbar .nav > li > a,
.navbar-inverse .brand,
.navbar-inverse .nav > li > a,
.navbar-inverse .navbar-search .search-query.focused,
.navbar-inverse .navbar-search .search-query:focus,
.progress .bar,
.subhead {
text-shadow: none;
}
/* Bootstrap RTL */
/* Pull right or left */
.pull-right {
Expand Down
41 changes: 38 additions & 3 deletions administrator/templates/isis/css/template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2333,6 +2333,7 @@ input[type="button"].btn-block {
.btn-warning:hover,
.btn-warning:focus {
background-color: #ad6704;
color: #fff;
text-decoration: none;
text-shadow: none;
}
Expand All @@ -2345,6 +2346,7 @@ input[type="button"].btn-block {
.btn-danger:hover,
.btn-danger:focus {
background-color: #802420;
color: #fff;
text-decoration: none;
}
.btn-success {
Expand All @@ -2356,6 +2358,7 @@ input[type="button"].btn-block {
.btn-success:hover,
.btn-success:focus {
background-color: #2f6f2f;
color: #fff;
text-decoration: none;
}
.btn-info {
Expand All @@ -2367,6 +2370,7 @@ input[type="button"].btn-block {
.btn-info:hover,
.btn-info:focus {
background-color: #1f6377;
color: #fff;
text-decoration: none;
}
.btn-inverse {
Expand All @@ -2378,6 +2382,7 @@ input[type="button"].btn-block {
.btn-inverse:hover,
.btn-inverse:focus {
background-color: #1e1e1e;
color: #fff;
text-decoration: none;
}
button.btn,
Expand Down Expand Up @@ -7633,7 +7638,7 @@ h6 {
color: #555;
padding: 3px 25px;
margin-left: -26px;
margin-right: -25px;
margin-right: -26px;
}
.sidebar-nav .nav-list > li.active > a {
color: #fff;
Expand Down Expand Up @@ -8008,8 +8013,8 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
vertical-align: baseline;
}
.j-jed-message {
line-height: 2em;
color: #333333;
line-height: 2em;
color: #333333;
}
.form-horizontal .control-label {
width: auto;
Expand Down Expand Up @@ -8199,8 +8204,12 @@ th .tooltip-inner {
}
/* Permissions dropdown display */
#permissions-sliders .chzn-container {
margin-top: -5px;
position: absolute;
}
#permissions-sliders .table td {
padding: 8px 8px 9px;
}
/* Component pop-up */
.container-popup {
padding: 28px 10px 10px 10px;
Expand Down Expand Up @@ -8580,3 +8589,29 @@ body.modal-open {
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
/* Removes Text Shadows */
.alert,
.alert-options,
.badge,
.breadcrumb > li,
.close,
.input-append .add-on,
.input-prepend .add-on,
.label,
.nav-header,
.nav-list .nav-header,
.nav-list > .active > a,
.nav-list > .active > a:focus,
.nav-list > .active > a:hover,
.nav-list > li > a,
.nav-tabs.nav-dark,
.navbar .brand,
.navbar .nav > li > a,
.navbar-inverse .brand,
.navbar-inverse .nav > li > a,
.navbar-inverse .navbar-search .search-query.focused,
.navbar-inverse .navbar-search .search-query:focus,
.progress .bar,
.subhead {
text-shadow: none;
}
5 changes: 5 additions & 0 deletions administrator/templates/isis/less/bootstrap/buttons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnWarningBackground, 15%);
color: #fff;
text-decoration: none;
text-shadow: none;
}
Expand All @@ -178,6 +179,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnDangerBackground, 15%);
color: #fff;
text-decoration: none;
}
}
Expand All @@ -190,6 +192,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnSuccessBackground, 15%);
color: #fff;
text-decoration: none;
}
}
Expand All @@ -202,6 +205,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnInfoBackground, 15%);
color: #fff;
text-decoration: none;
}
}
Expand All @@ -214,6 +218,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnInverseBackground, 15%);
color: #fff;
text-decoration: none;
}
}
Expand Down
36 changes: 34 additions & 2 deletions administrator/templates/isis/less/template.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,8 +1200,14 @@ th .tooltip-inner {
opacity: 1;
}
/* Permissions dropdown display */
#permissions-sliders .chzn-container {
position: absolute;
#permissions-sliders {
.chzn-container {
margin-top: -5px;
position: absolute;
}
.table td {
padding: 8px 8px 9px;
}
}
/* Component pop-up */
.container-popup {
Expand Down Expand Up @@ -1505,3 +1511,29 @@ body.modal-open {
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}

/* Removes Text Shadows */
.alert,
.alert-options,
.badge,
.breadcrumb > li,
.close,
.input-append .add-on,
.input-prepend .add-on,
.label,
.nav-header,
.nav-list .nav-header,
.nav-list > .active > a,
.nav-list > .active > a:focus,
.nav-list > .active > a:hover,
.nav-list > li > a,
.nav-tabs.nav-dark,
.navbar .brand,
.navbar .nav > li > a,
.navbar-inverse .brand,
.navbar-inverse .nav > li > a,
.navbar-inverse .navbar-search .search-query.focused,
.navbar-inverse .navbar-search .search-query:focus,
.progress .bar,
.subhead {
text-shadow: none;
}