Skip to content

Commit

Permalink
Merge pull request #480 from Sylvaner/feature/NettoyageCSS
Browse files Browse the repository at this point in the history
NettoyageCSS
  • Loading branch information
byackee authored Oct 29, 2018
2 parents 3990618 + 0913524 commit d294fdb
Show file tree
Hide file tree
Showing 6 changed files with 370 additions and 143 deletions.
30 changes: 30 additions & 0 deletions assets/css/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,33 @@
border-color:#1f1f1f;
}
}

.btn-app>.badge {
top: 3px;
right: 3px;
font-size: 12px;
}

.btn.btn-flat {
border:{
radius: 4px;
width: 1px;
}

-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
font-size: 15px;
}
.btn-app {
line-height: 2.5;
height: 70px;
margin: 5px 5px 5px 5px;
min-width: 115px;
}
.btn-tab {
line-height: 2;
}
.btn-box-tool {
padding: 8px 5px;
}
107 changes: 107 additions & 0 deletions assets/css/_cards.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
@charset "utf-8";

/* This file is part of NextDom.
*
* NextDom is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* NextDom is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with NextDom. If not, see <http://www.gnu.org/licenses/>.
*
* @Support <https://www.nextdom.org>
* @Email <[email protected]>
* @Authors/Contributors: Sylvaner, Byackee, cyrilphoenix71, ColonelMoutarde, edgd1er, slobberbone, Astral0, DanoneKiD
*/

/* Cards */
.eqLogicThumbnailContainer> div {
background-color: rgba(0,0,0,0) !important;
margin: {
top:0;
}
box-shadow: none;
border: none;
}

.card {
border: 1px solid $whitegray;
border-radius: .25rem;
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
margin: {
bottom: 60px;
top: 40px;
}
color: #333;
width: 100%;
position: relative;
display: flex;
flex-direction: column;
min-width: 0;
background: $white;
word-wrap: break-word;
background: {
color: $white;
clip: border-box;
}
& .card-header {
border-bottom: none;
background: transparent;
padding: 0.75rem 0.9rem 0rem 0.9rem;
margin-bottom: 0;
z-index: 3!important;
&:first-child {
border-radius: calc(.25rem - 1px) calc(.25rem - 1px) 0 0;
margin-top: -25px;
}
}
}

.card-stats .card-header.card-header-icon, .card-stats .card-header.card-header-text {
text-align: right;
}

.card[class*=bg-], .card[class*=bg-] .card-title, .card[class*=bg-] .card-title a, .card[class*=bg-] .icon i, .card [class*=card-header-], .card [class*=card-header-] .card-title, .card [class*=card-header-] .card-title a, .card [class*=card-header-] .icon i {
color: $white;
}


.card [class*=card-header-] .card-icon, .card [class*=card-header-] .card-text {
border-radius: 5px;
background-color: $darkgray;
margin: {
top: -10px;
right: 7px;
}
float: left;
height: 50px;
width: 50px;
padding-top: 5px;
text-align: center;
}
.card [class*=card-header-] .card-icon .icon {
position: absolute;
top: -18px;
left: 20px;
}
.card [class*=card-header-] .card-icon, .card [class*=card-header-] .card-text > i {
font-size: 2em;
}
.card-body {
margin: 0.75rem;
}
.card-category {
position: relative;
font-size: 16px;
top: -8px;
}
.card-dash {
box-shadow: 0px 5px 20px rgba(0, 0, 0, 0.08);
border: 1px solid;
}
41 changes: 41 additions & 0 deletions assets/css/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,44 @@ $nextdom_gray_title: $whitegray;
.icon-purple{
color: $purple;
}
.green{
background-color: $green;
}

.red{
background-color: $red;
}

.grey{
background-color: $gray;
}

.blue{
background-color: $blue;
}
.icon_blue{
color: $blue;
}

.icon_nextdom_blue{
color: $nextdom_blue;
}

.nextdom_blue{
color: $nextdom_blue;
}
.orange{
background-color: $orange;
}

.yellow{
background-color: $yellow;
}

.white{
background-color: $white;
}

.icon_white{
color: $white;
}
Loading

0 comments on commit d294fdb

Please sign in to comment.