Skip to content

Commit

Permalink
basics (need dry up)
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomasmaas @damianpm
thomasmaas authored and damianpm committed Sep 24, 2019
1 parent 6298ac8 commit 6315676
Show file tree
Hide file tree
Showing 11 changed files with 58 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/provider/_charts.scss
View file
Expand Up @@ -17,7 +17,7 @@
#mini-charts .charts {
position: relative;
border-radius: $border-radius;
background: $content-background;
background: $body-background;
border: $border-width solid $border-color;
min-width: 0;
height: line-height-times(3.5);
Expand Down
3 changes: 2 additions & 1 deletion app/assets/stylesheets/provider/_colorbox.scss
View file
Expand Up @@ -14,13 +14,14 @@

#colorbox {
box-shadow: 0 0 line-height-times(1/2) $box-shadow-color;
background: rgba($content-background, .99);
background: rgba($body-background, .99);
border: $border-width solid $border-color;
text-align: left;
border-radius: $border-radius;

form.formtastic {
width: 100%;
padding: 0;

fieldset.inputs {
border-top: 0;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/provider/_colors.scss
View file
Expand Up @@ -27,7 +27,7 @@ $facebook-color: #3b5998;

// Functional color names
$body-background: $white;
$content-background: $body-background;
$content-background: $gallery;
$background-color-base: $body-background;

$font-color: $outerSpaceGray;
Expand Down
37 changes: 33 additions & 4 deletions app/assets/stylesheets/provider/_commons.scss
View file
Expand Up @@ -14,6 +14,19 @@ main > h2,
font-weight: $font-weight-light;
}

.subsubmenu + h1,
.subsubmenu + h2,
#subsubmenu + h1,
#subsubmenu + h2,
main > h1:first-child,
main > h2:first-child,
#tab-content > h1:first-child,
#tab-content > h2:first-child {
padding: line-height-times(1);
margin: line-height-times(-1);
margin-bottom: line-height-times(1);
background-color: $body-background;
}

h1 {
font-size: $main-title-font-size;
Expand All @@ -30,13 +43,21 @@ h2, h3 {
margin-bottom: line-height-times(1/2);
}

.subsubmenu {
padding: line-height-times(1);
margin: line-height-times(-1);
background-color: $body-background;
}

#tab-content > h2:first-child,
#content > h2:first-child,
#subsubmenu + h2 {
font-size: $main-title-font-size;
padding-top: 0;
margin-bottom: line-height-times(1/2);
padding: line-height-times(1);
margin: line-height-times(-1);
margin-bottom: line-height-times(1);
line-height: 1;
background-color: $body-background;
}

h2 {
Expand All @@ -55,7 +76,15 @@ h3 {

p {
margin: line-height-times(1/2) 0 line-height-times(1) 0;
max-width: line-height-times(36);
//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;
}

dd p {
Expand Down Expand Up @@ -143,7 +172,7 @@ a img {
}

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

pre code {
Expand Down
7 changes: 6 additions & 1 deletion app/assets/stylesheets/provider/_forms.scss
View file
Expand Up @@ -156,7 +156,7 @@ form.formtastic fieldset.inputs > ol > li.select select {
form.formtastic fieldset.buttons {
border-top: $border-width solid $border-color;
margin: line-height-times(2) 0;
padding: line-height-times(1/2) 0 0 0;
padding: line-height-times(1/2) 0 line-height-times(1) 0;
text-align: right;

li {
Expand Down Expand Up @@ -243,6 +243,11 @@ form.formtastic {
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;

fieldset.inputs[data-behavior~=toggle-inputs] {
border: $border-width $border-color solid;
border-radius: $border-radius;
Expand Down
5 changes: 4 additions & 1 deletion app/assets/stylesheets/provider/_legacy_theme.scss
View file
Expand Up @@ -2,6 +2,9 @@ div.dashboard_bubble, div.wide_dashboard_bubble, div.narrow_dashboard_bubble {
border: $border-width solid $border-color;
padding: line-height-times(1);
margin-bottom: line-height-times(1);
background-color: $body-background;
box-shadow: rgba(3, 3, 3, 0.2) 0px 1px 2px 0px;
border: none;

&> table.list:first-child {
margin-top: line-height-times(-1/2);
Expand All @@ -10,7 +13,7 @@ div.dashboard_bubble, div.wide_dashboard_bubble, div.narrow_dashboard_bubble {
&> table.list:last-child {
margin-bottom: line-height-times(-1/2);

tr:last-child th,
tr:last-child th,
tr:last-child td {
border-bottom: 0;
}
Expand Down
3 changes: 3 additions & 0 deletions app/assets/stylesheets/provider/_menu.scss
View file
Expand Up @@ -39,6 +39,9 @@ ul.login-form-links {
height: line-height-times(1);
padding: 0 0 line-height-times(1.5) 0;
font-size: $font-size-sm;
padding: line-height-times(1);
margin: line-height-times(-1);
background-color: $body-background;

.active {
color: $subsubmenu-active-color;
Expand Down
3 changes: 3 additions & 0 deletions app/assets/stylesheets/provider/_tables.scss
View file
Expand Up @@ -14,6 +14,7 @@ $search-header-width: line-height-times(4);

table {
width: 100%;
background-color: $body-background;

.search th {
height: line-height-times(3);
Expand Down Expand Up @@ -53,8 +54,10 @@ th.header {
}

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%;

a.is-inline {
Expand Down
5 changes: 3 additions & 2 deletions app/assets/stylesheets/provider/admin/_dashboard.scss
View file
Expand Up @@ -74,12 +74,14 @@
}

.DashboardWidget {
background-color: $body-background;
width: 50%;
float: left;
position: relative;
height: line-height-times(10);
overflow: hidden;
border: $border-width solid $border-color;
//border: $border-width solid $border-color;
box-shadow: rgba(3, 3, 3, 0.2) 0px 1px 2px 0px;
padding: line-height-times(1/2);

.Dashboard-chart {
Expand Down Expand Up @@ -449,4 +451,3 @@ a:hover .u-notice {
}
}
}

2 changes: 1 addition & 1 deletion app/assets/stylesheets/provider/layouts/_main.scss
View file
Expand Up @@ -10,7 +10,7 @@ body {
}

#border {
background-color: #fff; // HACK: this will be taken care by PF4
background-color: $content-background; // HACK: this will be taken care by PF4
min-height: calc(100vh - 92px); // Header's height
position: relative;
text-align: left;
Expand Down
2 changes: 1 addition & 1 deletion config/webpacker.yml
View file
Expand Up @@ -31,7 +31,7 @@ default: &default

development:
<<: *default
compile: true
compile: false

dev_server:
host: localhost
Expand Down

0 comments on commit 6315676

Please sign in to comment.