Skip to content

Enhancement: Update Core UI to 1.0.6 #1001

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

Merged
merged 3 commits into from
Jan 24, 2018
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/node_modules
/public/hot
/public/storage
public/images
/storage/*.key
/vendor
/.idea
Expand Down
Binary file added resources/assets/img/logo-symbol.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/assets/js/backend/before.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

// Loaded before CoreUI app.js
require('../bootstrap');
require('../../../../node_modules/pace/pace.min');
require('pace');
require('../plugins');
1 change: 1 addition & 0 deletions resources/assets/sass/backend/_bootstrap-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ $font-size-base: 0.875rem;
// Breadcrumbs

$breadcrumb-bg: #fff;
$breadcrumb-margin-bottom: 1.5rem;

// Cards

Expand Down
3 changes: 2 additions & 1 deletion resources/assets/sass/backend/_core-variables.scss
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
// Core Overrides
// core overrides
$navbar-brand-logo: url('../../img/logo-symbol.png');
4 changes: 0 additions & 4 deletions resources/assets/sass/backend/_global-overrides.scss

This file was deleted.

14 changes: 7 additions & 7 deletions resources/assets/sass/backend/app.scss
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
/**
/*!
* CoreUI - Open Source Bootstrap Admin Template
* @version v1.0.0-alpha.6
* @version v1.0.6
* @link http://coreui.io
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
* @license MIT
*/

// Variable Overrides
@import "global-overrides";
// Override Boostrap variables
@import "bootstrap-variables";


// Font Awesome
@import "~font-awesome/scss/font-awesome";

// Simple Line Icons
@import "~simple-line-icons/scss/simple-line-icons";

// Bootstrap
@import "~bootstrap/scss/bootstrap";

// Import vendors styles
@import "vendors/vendors";

// Override core variables
@import "core-variables";
Expand All @@ -27,4 +27,4 @@
@import "core/core";

// Custom styles
@import "custom";
@import "custom";
19 changes: 1 addition & 18 deletions resources/assets/sass/backend/core/_animate.scss
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,33 +1,17 @@
// scss-lint:disable all
@charset "UTF-8";

.animated {
-webkit-animation-duration: 1s;
animation-duration: 1s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
// animation-fill-mode: both;
}

.animated.infinite {
-webkit-animation-iteration-count: infinite;
animation-iteration-count: infinite;
}

.animated.hinge {
-webkit-animation-duration: 2s;
animation-duration: 2s;
}

@-webkit-keyframes fadeIn {
from {
opacity: 0;
}

to {
opacity: 1;
}
}

@keyframes fadeIn {
from {
opacity: 0;
Expand All @@ -39,6 +23,5 @@
}

.fadeIn {
-webkit-animation-name: fadeIn;
animation-name: fadeIn;
}
12 changes: 6 additions & 6 deletions resources/assets/sass/backend/core/_breadcrumb-menu.scss
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
.breadcrumb-menu {
position: absolute;
top: 0;
right: $breadcrumb-padding-x;
margin-left: auto;

&::before {
display: none;
}

.btn {
padding-top: $breadcrumb-padding-y;
padding-bottom: $breadcrumb-padding-y;
.btn-group {
vertical-align: top;
}

.btn {
padding: 0 $input-btn-padding-x;
color: $text-muted;
vertical-align: top;
border: 0;

&:hover, &.active {
color: $body-color;
Expand Down
2 changes: 0 additions & 2 deletions resources/assets/sass/backend/core/_breadcrumb.scss
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
.breadcrumb {
position: relative;
margin-bottom: 1.5 * $spacer;

@include borders($breadcrumb-borders);
}
6 changes: 3 additions & 3 deletions resources/assets/sass/backend/core/_callout.scss
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

.chart-wrapper {
position: absolute;
top: 18px;
top: 10px;
left: 50%;
float: right;
width: 60%;
width: 50%;
}
}

Expand Down Expand Up @@ -45,7 +45,7 @@
}

@each $color, $value in $theme-colors {
&.callout-#{$color} {
.callout-#{$color} {
border-left-color: $value;

h4 {
Expand Down
5 changes: 3 additions & 2 deletions resources/assets/sass/backend/core/_footer.scss
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.app-footer {
min-height: $footer-height;
display: flex;
flex-wrap: wrap;
align-items: center;
padding: 0 $spacer;
line-height: $footer-height;
color: $footer-color;
background: $footer-bg;
@include borders($footer-borders);
Expand Down
Loading