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.

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

Adding grey backgrounds, white boxes and aligning items #1237

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions app/assets/stylesheets/provider/_bulk_operations.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
display: none;
}
}

4 changes: 4 additions & 0 deletions app/assets/stylesheets/provider/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ form.formtastic .button-bar, .button-bar {
}
}

.formtastic.cms_template .button-bar {
height: line-height-times(1.5);
}

@mixin outline-button($color: $font-color, $border-color: $border-color) {
color: $color;
display: inline-block;
Expand Down
28 changes: 21 additions & 7 deletions app/assets/stylesheets/provider/_commons.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'provider/layouts/_main.scss';

html {
@include typography-base();
}
Expand Down Expand Up @@ -76,17 +78,26 @@ h3 {

p {
margin: line-height-times(1/2) 0 line-height-times(1) 0;
//max-width: line-height-times(36);
}

h1 + p,
h2 + p {
padding: line-height-times(1);
margin: line-height-times(-1);
margin-bottom: line-height-times(1);
background-color: $body-background;
}

main > p:not(:first-child) {
padding: line-height-times(1);
@include white-box-shadow;
}

main > h1:first-child + p,
main > h2:first-child + p {
box-shadow: none;
margin: line-height-times(-1) line-height-times(-1) line-height-times(1) line-height-times(-1);
}

dd p {
margin: 0;
}
Expand All @@ -105,7 +116,6 @@ ul, p, ol, dl {

p + ul {
list-style: none;
margin-top: line-height-times(-2/3);
padding-left: line-height-times(2/3);
}

Expand Down Expand Up @@ -171,10 +181,6 @@ a img {
border: none;
}

.round, #page_templates, .alwaysontop {
//@include border-radius($border-radius);
}

pre code {
border-radius: $border-radius;
margin: line-height-times(1/2) 0 line-height-times(1);
Expand Down Expand Up @@ -235,3 +241,11 @@ hr, {
color: $success-color;
cursor: move;
}

#forum {
.u-dl, .post {
padding: line-height-times(1);
@include white-box-shadow;
}
}

3 changes: 1 addition & 2 deletions app/assets/stylesheets/provider/_fields_definitions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@

li {
background: $background-color-base no-repeat line-height-times(1/2) center image-url("drag-icon.png");
border: $border-width solid $border-color;
margin-bottom: line-height-times(1/2);
padding: line-height-times(1/2) 0 line-height-times(1/2) line-height-times(1);
border-radius: $border-radius;
overflow: visible !important;
@include white-box-shadow;

&.ui-sortable-helper {
@include box-shadow(0 0 line-height-times(1/2) $box-shadow-color);
Expand Down
6 changes: 2 additions & 4 deletions app/assets/stylesheets/provider/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,11 @@ Load this stylesheet after formtastic.css in your layouts to override the CSS to

form.formtastic {
text-align: left; /* overriding legacy_theme text-align: center*/
margin: line-height-times(1) 0;
min-width: line-height-times(20);
width: 100%;

padding: line-height-times(1);
padding-bottom: line-height-times(0);
background-color: $body-background;
box-shadow: rgba(3, 3, 3, 0.2) 0px 1px 2px 0px;
@include white-box-shadow;

fieldset.inputs[data-behavior~=toggle-inputs] {
border: $border-width $border-color solid;
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/provider/_info_box.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
.InfoBox {
border-radius: $border-radius;
border: $border-width solid $border-color;
display: block;
margin: line-height-times(1/2) 0;
padding: line-height-times(1);
@include white-box-shadow;

&--notice {
background: $dirty-color;
Expand Down
3 changes: 2 additions & 1 deletion app/assets/stylesheets/provider/_inline_helper.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
}

.helpButton {
position: absolute;
position: relative;
margin-left: line-height-times(1/4);
top: line-height-times(1/4);
}

.formtastic .helpButton {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/provider/_links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,5 @@ button.create_key {

.ExportLink {
float: right;
margin-top: line-height-times(1);
margin: line-height-times(1);
}
11 changes: 11 additions & 0 deletions app/assets/stylesheets/provider/_logo.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'provider/layouts/_main.scss';

.logo-3scale {
position: relative;
float: left;
Expand Down Expand Up @@ -37,3 +39,12 @@
padding: 0;
float: none;
}

#logo_container {
padding: line-height-times(1);
@include white-box-shadow;

.delete {
float: right;
}
}
1 change: 1 addition & 0 deletions app/assets/stylesheets/provider/_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ ul.login-form-links {
font-size: $font-size-sm;
padding: line-height-times(1);
margin: line-height-times(-1);
margin-bottom: line-height-times(1);
background-color: $body-background;

.active {
Expand Down
3 changes: 2 additions & 1 deletion app/assets/stylesheets/provider/_metrics.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ th.collapsible {
table.contract_table {
width: 100%;
margin-bottom: line-height-times(1/2);
border-collapse: collapse;
border-spacing: 0;
border: line-height-times(1) solid $white;
@include white-box-shadow;

&#features {
table-layout: fixed;
Expand Down
13 changes: 3 additions & 10 deletions app/assets/stylesheets/provider/_patternfly_tabs_fake.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,11 @@

&.pf-m-current {
.pf-c-tabs__button::before {
border-bottom-width: 0;
border-bottom-color: $white;
}

.pf-c-tabs__button {
background-color: $white;
color: rgb(0, 102, 204); //var(--pf-c-tabs__item--m-current--Color);
}

Expand Down Expand Up @@ -87,11 +88,6 @@
top: 0;
}

.pf-c-tabs__item:last-of-type {
.pf-c-tabs__button::before {
border-right-width: 1px;
}
}
}
}

Expand All @@ -114,7 +110,7 @@
}

.pf-tabs-header {
border-bottom: 1px solid white;
border-bottom: 1px solid transparent;
float: right;
line-height: line-height-times(1);
position: relative;
Expand All @@ -125,6 +121,3 @@
text-transform: uppercase;
}

.pf-c-tabs .pf-c-tabs__list .pf-c-tabs__item.pf-m-current .pf-c-tabs__button::before {
border-bottom: 1px solid white;
}
1 change: 1 addition & 0 deletions app/assets/stylesheets/provider/_pop_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ $pf4-sidebar-width: 18.125rem;
float: left;

.PopNavigation-list {
background-color: $white;
left: $pf4-sidebar-width;
margin-left: line-height-times(1 / 2);
}
Expand Down
9 changes: 9 additions & 0 deletions app/assets/stylesheets/provider/_section.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
.Section {
margin-bottom: line-height-times(2);

&.u-toggleableBySettingsBox p {
@include white-box-shadow;
}

&#access-tokens p,
&#service-tokens p {
@include white-box-shadow;
}
}
4 changes: 3 additions & 1 deletion app/assets/stylesheets/provider/_services.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
ul.listing {
clear: left;
list-style: none;
border-radius: $border-radius;
background-color: $white;
padding: line-height-times(1);
border: $border-width solid $border-color;
position: relative;
Expand Down Expand Up @@ -149,6 +149,8 @@

.latest-alerts, .latest-apps, .service-settings, .service-plans, .application-plans, #mini-charts {
@extend ul.listing;
border: none;
@include white-box-shadow;
}

p {
Expand Down
10 changes: 3 additions & 7 deletions app/assets/stylesheets/provider/_settings_box.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
.SettingsBox,
.IntegrationSettingsBox {
background-color: $content-background;
@include white-box-shadow;
position: relative;

&-toggle {
background-color: $content-background;
color: $link-color;
cursor: pointer;
display: block !important;
Expand All @@ -14,7 +13,6 @@
padding: line-height-times(1/4) line-height-times(1/4);
position: relative;
text-decoration: underline;
top: line-height-times(-3/4);
z-index: 10;

&:hover {
Expand All @@ -27,8 +25,6 @@
}

&-summary {
border: $border-width solid $border-color;
border-radius: $border-radius;
min-height: line-height-times(2);
padding: line-height-times(1);
position: relative;
Expand Down Expand Up @@ -92,10 +88,9 @@
}

&-summary {
border: $border-width-lg solid $border-color;
border: $border-width-lg solid transparent;
min-height: line-height-times(2);
padding: line-height-times(1);
border-radius: $border-radius;
position: relative;
}

Expand All @@ -109,5 +104,6 @@

&--is-erroneous {
border-color: $error-color;
@include white-box-shadow;
}
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/provider/_sidetabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ $tab-min-height: line-height-times(21, true);
float: left;
width: $tab-content-width;
margin-left: -$border-width;
background-color: $tab-content-color;
border-left: $border-width solid $border-color;
border-right: none;
min-height: $tab-min-height;
padding: 0 0 line-height-times(1) line-height-times(1);
@include white-box-shadow;
}
14 changes: 12 additions & 2 deletions app/assets/stylesheets/provider/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ table.data {
border: solid $body-background line-height-times(1);
margin-bottom: line-height-times(1);
margin-top: line-height-times(1/2);
box-shadow: rgba(3, 3, 3, 0.2) 0px 1px 2px 0px;
width: 100%;
@include white-box-shadow;

a.is-inline {
display: inline;
Expand Down Expand Up @@ -183,7 +183,9 @@ table.list {
}
}


table.mini {
border: line-height-times(1) solid $white;
}

table.mini td {
padding-right: line-height-times(1);
Expand All @@ -197,6 +199,7 @@ table.mini, table#configs {

table.list, table.data {
border-collapse: collapse;
border-color: transparent;
margin-bottom: 0;
margin-top: 0;
width: 100%;
Expand Down Expand Up @@ -292,3 +295,10 @@ td.thhead h3 {
table.list.list-checkmarks tr th {
word-break: break-word;
}

// IE 11 hack
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
#results_list {
@include white-box-shadow;
}
}
29 changes: 29 additions & 0 deletions app/assets/stylesheets/provider/admin/_account.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,40 @@
#plan-overview {
@extend div.right;
}

.overview-box {
& > table.list {
margin: 1px;
@include white-box-shadow;

tr:last-child {
th, td {
border-bottom: 2px solid transparent;
}
}
}

#account-redhat-connect p,
#account-cancellation p {
margin: 1px;
@include white-box-shadow;
}

table.list th,
table.list td {
padding: line-height-times(1);
}
}

}

#key-overview {
margin-bottom: line-height-times(2);

.info {
@include white-box-shadow;
}

.key {
background-repeat: no-repeat;
background-position: 10px 20px;
Expand Down