Skip to content

Commit

Permalink
Update CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
@brenopolanski
brenopolanski committed Feb 15, 2016
1 parent 98caca6 commit a4a3b99
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 66 deletions.
47 changes: 22 additions & 25 deletions src/main/resources/dist/saiku/saiku.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
html {
position: relative;
min-height: 100%;
background: #f3f3f3;
background: #ebeff2;
}
body {
overflow-x: hidden;
margin: 0;
font-family: "Noto Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
color: #797979;
background: #f3f3f3;
background: #ebeff2;
}
h1,
h2,
Expand Down Expand Up @@ -97,19 +97,16 @@ a:focus {
.content-box {
margin-bottom: 20px;
padding: 20px;
border: 1px solid rgba(54,64,74,.1);
border-radius: 5px;
background: #fff;
background-clip: padding-box;
box-shadow: 0 1px 1px 0 rgba(0,0,0,.1), 0 -1px 4px 0 rgba(0,0,0,.08);
}
.wrapper-page {
position: relative;
width: 420px;
margin: 5% auto;
}
.wrapper-page .content-box {
border: 1px solid rgba(54,64,74,.1);
}
.bg-page {
position: absolute;
width: 100%;
Expand Down Expand Up @@ -344,34 +341,34 @@ a:focus {
/* BACKGROUND COLORS
========================================================================= */
.bg-custom {
background-color: #58c9c7 !important;
background: #58c9c7 !important;
}
.bg-primary {
background-color: #5d9cec !important;
background: #5d9cec !important;
}
.bg-success {
background-color: #81c868 !important;
background: #81c868 !important;
}
.bg-info {
background-color: #34d3eb !important;
background: #34d3eb !important;
}
.bg-warning {
background-color: #ffbd4a !important;
background: #ffbd4a !important;
}
.bg-danger {
background-color: #f05050 !important;
background: #f05050 !important;
}
.bg-inverse {
background-color: #4c5667 !important;
background: #4c5667 !important;
}
.bg-muted {
background-color: #98a6ad !important;
background: #98a6ad !important;
}
.bg-white {
background-color: #fff !important;
background: #fff !important;
}
.bg-lightdark {
background-color: #f4f8fb !important;
background: #f4f8fb !important;
}
/* TEXT COLORS
========================================================================= */
Expand Down Expand Up @@ -421,7 +418,7 @@ a:focus {
.dropdown-menu > .active a:hover,
.dropdown-menu > .active a:focus {
color: #36404a;
background-color: #f3f3f3;
background: #f3f3f3;
}
/* BADGE
========================================================================= */
Expand All @@ -430,7 +427,7 @@ a:focus {
padding: 3px 5px;
font-size: 12px;
font-weight: 600;
background-color: #5fbeaa;
background: #5fbeaa;
text-transform: uppercase;
}
.badge-xs {
Expand All @@ -442,22 +439,22 @@ a:focus {
transform: translate(0, -2px);
}
.badge-primary {
background-color: #5d9cec;
background: #5d9cec;
}
.badge-success {
background-color: #81c868;
background: #81c868;
}
.badge-info {
background-color: #34d3eb;
background: #34d3eb;
}
.badge-warning {
background-color: #ffbd4a;
background: #ffbd4a;
}
.badge-danger {
background-color: #f05050;
background: #f05050;
}
.badge-inverse {
background-color: #4c5667;
background: #4c5667;
}
/* =========================================================================
FORM
Expand Down Expand Up @@ -754,7 +751,7 @@ a.waves-effect .waves-ripple {
margin-bottom: 0;
border: none;
border-radius: 0;
background-color: #fff;
background: #fff;
}
.navbar-default .badge {
position: absolute;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/dist/saiku/saiku.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/resources/dist/saiku/saiku.js.map
View file

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions src/main/resources/src/styl/_bootstrap-custom.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,34 +77,34 @@
========================================================================= */

.bg-custom
background-color $custom !important
background $custom !important

.bg-primary
background-color $primary !important
background $primary !important

.bg-success
background-color $success !important
background $success !important

.bg-info
background-color $info !important
background $info !important

.bg-warning
background-color $warning !important
background $warning !important

.bg-danger
background-color $danger !important
background $danger !important

.bg-inverse
background-color $inverse !important
background $inverse !important

.bg-muted
background-color $muted !important
background $muted !important

.bg-white
background-color $white !important
background white !important

.bg-lightdark
background-color $lightdark !important
background $lightdark !important

/*! TEXT COLORS
========================================================================= */
Expand Down Expand Up @@ -134,7 +134,7 @@
color $muted

.text-white
color $white
color white

.text-dark
color $lightdark7 !important
Expand All @@ -155,7 +155,7 @@
a:hover
a:focus
color #36404a
background-color #f3f3f3
background #f3f3f3

/*! BADGE
========================================================================= */
Expand All @@ -165,7 +165,7 @@
padding 3px 5px
font-size 12px
font-weight 600
background-color #5fbeaa
background #5fbeaa
text-transform uppercase

.badge-xs
Expand All @@ -176,19 +176,19 @@
transform translate(0, -2px)

.badge-primary
background-color #5d9cec;
background #5d9cec;

.badge-success
background-color #81c868;
background #81c868;

.badge-info
background-color #34d3eb;
background #34d3eb;

.badge-warning
background-color #ffbd4a;
background #ffbd4a;

.badge-danger
background-color #f05050;
background #f05050;

.badge-inverse
background-color #4c5667;
background #4c5667;
4 changes: 2 additions & 2 deletions src/main/resources/src/styl/_button.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
border 1px solid $lightdark-alt
border-radius 3px
outline none !important
background $white
background white
content ""
transition 0.3s ease-in-out
&::after
Expand Down Expand Up @@ -83,4 +83,4 @@
border-color $primary
background $primary
&::after
color $white
color white
10 changes: 4 additions & 6 deletions src/main/resources/src/styl/_core.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
html
position relative
min-height $height
background $light3
background $light5

body
overflow-x hidden
margin 0
font-family $font-primary
font-weight 400
color #797979
background $light3
background $light5

h1
h2
Expand Down Expand Up @@ -96,16 +96,14 @@ a
margin-bottom 20px
padding 20px
border-radius 5px
background $white
background white
background-clip padding-box
box-shadow 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 4px 0 rgba(0, 0, 0, 0.08)
border 1px solid rgba(54, 64, 74, 0.1)

.wrapper-page
position relative
width 420px
margin 5% auto
.content-box
border 1px solid rgba(54, 64, 74, 0.1)

.bg-page
// background url("../../dist/assets/images/bgpage/bg1.jpg")
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/src/styl/_form.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ textarea
color #565656
border 1px solid #e3e3e3
border-radius 4px
background $white
background white
box-shadow none
transition all 300ms linear
&:focus
color $lightdark3
border 1px solid #aaa
outline 0 !important
background $white
background white
box-shadow none

.form-horizontal
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/src/styl/_menubar.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
margin-bottom 0
border none
border-radius 0
background-color $white
background white
.badge
position absolute
top 12px
Expand All @@ -53,7 +53,7 @@
position relative
padding 0 15px
line-height 60px
color $white
color white
i
font-size 16px

Expand All @@ -71,5 +71,5 @@
border none
background transparent
&:hover
color: $white
color white

10 changes: 5 additions & 5 deletions src/main/resources/src/styl/_toolbar.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
&.left
position absolute
top 60px
background $white
background white
box-shadow 0 1px 1px rgba(0, 0, 0, 0.1)

.fixed-left
Expand All @@ -35,13 +35,13 @@
position fixed
bottom 50px
left 0
height 100%
height $height
margin-top 0
margin-bottom -70px
padding-bottom 70px

.sidebar-inner
height 100%
height $height

// TODO: Refactor `.sidebar-menu`
.sidebar-menu
Expand All @@ -60,7 +60,7 @@
.sidebar-menu
padding-top 30px
padding-bottom 30px
width 100%
width $width

.sidebar-menu
a
Expand All @@ -74,7 +74,7 @@
margin 4px 0
padding 12px 20px
color #36404a
border-left 3px solid $white
border-left 3px solid white
&:hover
color #5fbeaa
text-decoration none
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/src/styl/_variables.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ $warning = #ffbd4a
$danger = #f05050
$inverse = #4c5667
$muted = #98a6ad
$white = #fff
$dark = #36404a

$light = #eee
Expand Down

0 comments on commit a4a3b99

Please sign in to comment.