Skip to content

B
bootstrap_beagle
Commit 914beff6 by xuchao
Options

Updated: $roboto-font-path and img_path

parent ab428fca
Showing with 39 additions and 39 deletions
app/assets/stylesheets/config/_beagle-variables.scss
......@@ -7,8 +7,8 @@
// Paths
$img-path: "img" !default;
$fonts-path: "/assets" !default;
$lib-path: "lib" !default;
$fonts-path: "fonts" !default;
$lib-path: "/assets" !default;
$bootstrap-path: "bootstrap/scss" !default;
// Logo
......@@ -18,10 +18,10 @@ $logo-white: asset_path("#{$img-path}/logo-white.png"
$logo-white-2x: asset_path("#{$img-path}/logo-white-xx.png");
// Theme Fonts
$roboto-font-path: '#{$fonts-path}/roboto' !default;
$roboto-font-path: 'roboto' !default;
$roboto: 'Roboto', Arial, sans-serif !default;
$icons-font-path: '#{$fonts-path}/material-design-icons/fonts' !default;
$icons-font-path: 'material-design-icons/fonts' !default;
$icons-font: 'Material Icons' !default;
//
......@@ -29,7 +29,7 @@ $icons-font: 'Material Icons' !default;
//
// Color System
$white: #FFFFFF !default;
$white: #FFFFFF !default;
$gray-100: #f5f5f5 !default;
$gray-200: #dddddd !default;
$gray-300: #dee2e6 !default;
......@@ -37,7 +37,7 @@ $gray-500: #a1a1a1 !default;
$gray-600: #878787 !default;
$gray-700: #636c72 !default;
$gray-800: #3d3c3c !default;
$black: #000000 !default;
$black: #000000 !default;
$green: #60C060 !default;
$blue: #5BC0DE !default;
......@@ -45,14 +45,14 @@ $orange: #FF9900 !default;
$red: #DF4B33 !default;
// Brand Colors
$primary: #4285f4 !default;
$success: #34a853 !default;
$info: #6ba4ff !default;
$warning: #fbbc05 !default;
$danger: #ea4335 !default;
$light: $white !default;
$dark: $gray-800 !default;
$grey: #cccccc !default;
$primary: #4285f4 !default;
$success: #34a853 !default;
$info: #6ba4ff !default;
$warning: #fbbc05 !default;
$danger: #ea4335 !default;
$light: $white !default;
$dark: $gray-800 !default;
$grey: #cccccc !default;
// Enable contrast color calculations (Requires newer version of libsass)
$enable-contrast-calculation: true !default;
......@@ -113,15 +113,15 @@ $top-header-colors: (
) !default;
//Spacing
$spacer: 1rem !default; // 13px
$spacer: 1rem !default; // 13px
$spacers: (
0: 0,
0: 0,
1: ($spacer / 2.6),
2: ($spacer / 1.3),
3: ($spacer * 1.154),
4: ($spacer * 1.539),
5: ($spacer * 1.923),
6: ($spacer * 2.308),
6: ($spacer * 2.308),
7: ($spacer * 3.077),
8: ($spacer * 3.851)
) !default;
......
app/assets/stylesheets/includes/elements/_invoice.scss
......@@ -18,7 +18,7 @@
.invoice-header {
margin-bottom: $invoice-header-margin;
@include laptop {
margin-bottom: $invoice-header-margin / 2;
}
......@@ -34,15 +34,15 @@
.invoice-logo {
height: $invoice-logo-height;
min-width: $invoice-logo-width;
background-image: url("#{$img-path}/logo-xx.png");
background-image: url(asset_path("#{$img-path}/logo-xx.png"));
background-repeat: no-repeat;
background-position: 0 ;
@include laptop {
height: $invoice-logo-small-height;
width: $invoice-logo-small-width;
background-image: url("#{$img-path}/logo.png");
}
background-image: url(asset_path("#{$img-path}/logo.png"));
}
@include phone {
margin: 0 auto 20px;
......@@ -53,7 +53,7 @@
@media #{$print} {
height: $invoice-logo-small-height !important;
width: $invoice-logo-small-width !important;
background-image: url("#{$img-path}/logo.png") !important;
background-image: url(asset_path("#{$img-path}/logo.png")) !important;
display: block !important;
background-repeat: no-repeat !important;
}
......@@ -143,7 +143,7 @@
.icon {
width: $invoice-direction-bubble-size;
height: $invoice-direction-bubble-size;
height: $invoice-direction-bubble-size;
border-radius: 50%;
background-color: darken(theme-color("light"), 3%);
font-size: 3.846rem;
......@@ -152,7 +152,7 @@
@include laptop {
width: $invoice-direction-bubble-size / 2;
height: $invoice-direction-bubble-size / 2;
height: $invoice-direction-bubble-size / 2;
line-height: 40px;
font-size: 1.923rem;
}
......@@ -204,7 +204,7 @@
}
&.description {
}
&.hours {
......@@ -269,7 +269,7 @@
@include phone {
margin-bottom: $invoice-message-margin / 2;
}
.title {
font-weight: $font-weight-medium;
text-transform: uppercase;
......
app/assets/stylesheets/includes/pages/_404.scss
......@@ -2,7 +2,7 @@
[Error pages]
*/
.be-error{
.error-container{
text-align: center;
margin-top: 100px;
......@@ -75,7 +75,7 @@
.error-container{
.error-number{
background: url("#{$img-path}/404-bg.png") no-repeat center center;
background: url(asset_path("#{$img-path}/404-bg.png")) no-repeat center center;
background-size: contain;
@include phone {
......
app/assets/stylesheets/includes/plugins/_gritter.scss
......@@ -19,7 +19,7 @@
}
.gritter-item-wrapper{
background: url("#{$lib-path}/jquery.gritter/images/gritter-bg.png");
background: url(asset_path('jquery.gritter/images/gritter-bg.png'));
box-shadow: 0 0px 4px rgba(0, 0, 0, 0.2);
.gritter-item{
......@@ -94,14 +94,14 @@
.gritter-without-image{
border-left: 0;
}
}
}
}
&.img-rounded{
border-radius: 0;
.gritter-img-container{
.gritter-image{
border-radius: 50%;
}
......@@ -123,7 +123,7 @@
.gritter-close{
opacity: 0.5;
&:after{
color: $body-color;
}
......@@ -140,7 +140,7 @@
.gritter-close{
opacity: 0.7;
&:hover{
opacity: 1;
}
......
vendor/assets/stylesheets/jquery.gritter/css/jquery.gritter.css
......@@ -32,17 +32,17 @@
.gritter-item-wrapper {
position:relative;
margin:0 0 10px 0;
background:url('../images/ie-spacer.gif'); /* ie7/8 fix */
background:url(asset_path('jquery.gritter/images/ie-spacer.gif')); /* ie7/8 fix */
}
.gritter-top {
background:url(../images/gritter.png) no-repeat left -30px;
background:url(asset_path('jquery.gritter/images/gritter.png')) no-repeat left -30px;
height:10px;
}
.hover .gritter-top {
background-position:right -30px;
}
.gritter-bottom {
background:url(../images/gritter.png) no-repeat left bottom;
background:url(asset_path('jquery.gritter/images/gritter.png')) no-repeat left bottom;
height:8px;
margin:0;
}
......@@ -51,7 +51,7 @@
}
.gritter-item {
display:block;
background:url(../images/gritter.png) no-repeat left -40px;
background:url(asset_path('jquery.gritter/images/gritter.png')) no-repeat left -40px;
color:#eee;
padding:2px 11px 8px 11px;
font-size: 11px;
......@@ -70,7 +70,7 @@
position:absolute;
top:5px;
left:3px;
background:url(../images/gritter.png) no-repeat left top;
background:url(asset_path('jquery.gritter/images/gritter.png')) no-repeat left top;
cursor:pointer;
width:30px;
height:30px;
......@@ -101,7 +101,7 @@
.gritter-light .gritter-bottom,
.gritter-light .gritter-top,
.gritter-light .gritter-close {
background-image: url(../images/gritter-light.png);
background-image: url(asset_path('jquery.gritter/images/gritter-light.png'));
color: #222;
}
.gritter-light .gritter-title {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment