styles refactoring as per 1.x theme update

This commit is contained in:
nixa 2016-05-16 16:30:56 +03:00
parent 6c8e632164
commit 06d0dc1c99
23 changed files with 590 additions and 705 deletions

View file

@ -1,9 +1,8 @@
@import '../../../theme/sass/conf/conf';
div.blurCalendar {
div.blurCalendar{
font-size: 12px;
}
.fc {
direction: ltr;
text-align: left;
@ -58,7 +57,7 @@ div.blurCalendar {
}
th, td {
border: 1px solid;
border: 1px solid rgba(255,255,255,0.3);
padding: 0;
vertical-align: top;
}
@ -97,11 +96,11 @@ div.blurCalendar {
.fc-unthemed {
th, td, hr, thead, tbody, .fc-row, .fc-popover {
border-color: $border;
border-color: rgba($border, 0.3);
}
.fc-popover {
background-color: #ffffff;
background-color: $default;
border: 1px solid;
.fc-header {
@ -120,12 +119,12 @@ div.blurCalendar {
}
.fc-today {
background: rgba(255, 255, 255, 0.15);
background: rgba(255,255,255,0.15);
}
}
.fc-highlight {
background: rgba(255, 255, 255, 0.25);
background: rgba(255,255,255,0.25);
opacity: .3;
}
@ -333,7 +332,7 @@ div.blurCalendar {
.fc-event,
.fc-event:hover,
.ui-widget .fc-event {
color: #ffffff;
color: $label-text;
text-decoration: none;
}
@ -666,7 +665,7 @@ a.fc-more {
.fc-bg {
z-index: 1;
background: #fff;
background: $default;
opacity: .25;
filter: alpha(opacity=25);
}
@ -720,55 +719,48 @@ a.fc-more {
}
}
.fc-day-grid-container.fc-scroller {
height: auto !important;
.fc-day-grid-container.fc-scroller {
height: auto!important;
}
body.badmin-transparent {
.calendar-panel.panel .panel-body{
padding: 0;
}
.calendar-panel.card .card-body {
padding: 0;
}
.fc-body > tr > .fc-widget-content{
border: none;
}
.fc-body > tr > .fc-widget-content {
border: none;
.fc-head{
color: $label-text;
background-color: $primary;
td, th{
border:none;
}
.fc-head {
color: $default;
background-color: $primary;
td, th {
border: none;
}
div.fc-widget-header {
padding: 5px 0;
}
}
.fc td {
border-color: rgba(255, 255, 255, 0.1);
}
.fc-today-button, .fc-month-button, .fc-agendaWeek-button, .fc-agendaDay-button {
display: none;
}
.blurCalendar {
margin-top: 15px;
}
.fc-prev-button, .fc-next-button {
position: absolute;
background: transparent;
box-shadow: none;
border: none;
color: $default;
}
.fc-next-button {
left: 30px;
}
.fc-prev-button {
}
.fc-day-number {
color: $default;
opacity: 0.9;
div.fc-widget-header{
padding: 5px 0;
}
}
.fc-today-button, .fc-month-button, .fc-agendaWeek-button, .fc-agendaDay-button {
display: none;
}
.blurCalendar{
margin-top: 15px;
}
.fc-prev-button, .fc-next-button{
position: absolute;
background: transparent;
box-shadow: none;
border: none;
color: $default-text;
}
.fc-next-button {
left: 30px;
}
.fc-prev-button {
}
.fc-day-number{
color: $default-text;
opacity: 0.9;
}

View file

@ -1,25 +1,21 @@
@import '../../../theme/sass/conf/conf';
.feed-panel .card-body {
.feed-panel .panel-body{
padding: 10px 0;
}
.feed-message {
$text-message-color: $default;
$text-message-color: $default-text;
$video-message-color: $danger;
$image-message-color: $success;
$geo-message-color: $primary;
padding: 10px 0;
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
padding: 10px 0 ;
border-bottom: 1px solid rgba(0,0,0,0.12);
box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.12);
&:first-child {
padding-top: 0;
}
.hidden {
display: none!important;
}
.message-icon {
cursor: pointer;
width: 60px;
@ -86,7 +82,7 @@
border-radius: 5px;
margin: 0 0 0 80px;
padding: 5px 20px;
color: #fff;
color: $default-text;
width: 280px;
height: 70px;
@ -142,7 +138,7 @@
padding-top: 10px;
width: 100%;
height: auto;
float: none !important;
float: none!important;
}
}
@ -162,58 +158,65 @@
}
}
.line-clamp {
display: block;
display: -webkit-box;
-webkit-box-orient: vertical;
position: relative;
line-height: 1.2;
overflow: hidden;
text-overflow: ellipsis;
padding: 0 !important;
.line-clamp
{
display : block;
display : -webkit-box;
-webkit-box-orient : vertical;
position : relative;
line-height : 1.2;
overflow : hidden;
text-overflow : ellipsis;
padding : 0 !important;
}
@media screen and (-webkit-min-device-pixel-ratio: 0) {
.line-clamp:after {
content: '...';
text-align: right;
bottom: 0;
right: 0;
width: 25%;
display: block;
position: absolute;
height: calc(1em * 1.2);
@media screen and (-webkit-min-device-pixel-ratio:0) {
.line-clamp:after
{
content : '...';
text-align : right;
bottom : 0;
right : 0;
width : 25%;
display : block;
position : absolute;
height : calc(1em * 1.2);
}
}
@supports (-webkit-line-clamp: 1) {
.line-clamp:after {
display: none !important;
@supports (-webkit-line-clamp: 1)
{
.line-clamp:after
{
display : none !important;
}
}
.line-clamp-1 {
-webkit-line-clamp: 1;
height: calc(1em * 1.2 * 1);
.line-clamp-1
{
-webkit-line-clamp : 1;
height : calc(1em * 1.2 * 1);
}
.line-clamp-2 {
-webkit-line-clamp: 2;
height: calc(1em * 1.2 * 2);
.line-clamp-2
{
-webkit-line-clamp : 2;
height : calc(1em * 1.2 * 2);
}
.line-clamp-3 {
-webkit-line-clamp: 3;
height: calc(1em * 1.2 * 3);
.line-clamp-3
{
-webkit-line-clamp : 3;
height : calc(1em * 1.2 * 3);
}
.line-clamp-4 {
-webkit-line-clamp: 4;
height: calc(1em * 1.2 * 4);
.line-clamp-4
{
-webkit-line-clamp : 4;
height : calc(1em * 1.2 * 4);
}
.line-clamp-5 {
-webkit-line-clamp: 5;
height: calc(1em * 1.2 * 5);
.line-clamp-5
{
-webkit-line-clamp : 5;
height : calc(1em * 1.2 * 5);
}

View file

@ -1,30 +1,36 @@
@import "../../../theme/sass/conf/conf";
.card.popular-app {
&>.card-body {
.panel.popular-app {
&>.panel-body {
padding: 0;
}
.popular-app-img {
.popular-app-img-container {
position: relative;
background: rgba(0, 0, 0, 0.5);
padding: 30px 0;
height: 260px;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
img {
max-width: 60%;
max-height: 70%;
.popular-app-img {
width: 260px;
position: absolute;
transform: translateY(-50%) translate(-50%);
top: 50%;
left: 50%;
.logo-text {
display: inline-block;
margin: 10px;
font-size: 26px;
color: $default-text;
}
}
}
.popular-app-cost {
font-size: 20px;
padding: 20px 22px;
border-bottom: 1px solid $border;
border-bottom: 1px solid $border-light;
border-top: 1px solid $border-light;
}
.popular-app-info {
padding: 20px 22px;
@ -42,13 +48,6 @@
}
}
body.badmin-transparent {
.popular-app-img {
border-top-right-radius: 5px;
border-top-left-radius: 5px;
}
.popular-app-cost {
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
}
}
.blur-theme .panel.popular-app .popular-app-img-container {
background: rgba(0, 0, 0, 0.5);
}

View file

@ -1,6 +1,5 @@
@import '../../../theme/sass/conf/conf';
input.task-todo {
margin-bottom: 8px;
}
@ -25,11 +24,11 @@ ul.todo-list {
right: 12px;
font-size: 32px;
transition: color 0.2s;
color: $input-border;
color: rgba($input-border, 0.5);
visibility: hidden;
line-height: 42px;
&:hover {
color: $danger-dark;
color: $input-border;
}
}
&:hover {
@ -40,34 +39,13 @@ ul.todo-list {
&.checked {
.todo-text {
color: #BFBFBF;
color: $default-text;
}
&:before {
background: $input-border !important;
}
}
@mixin mark($color) {
i.mark {
background: $color;
}
}
&.primary {
@include mark($primary);
}
&.danger {
@include mark($danger);
}
&.success {
@include mark($success);
}
&.info {
@include mark($info);
}
&.warning {
@include mark($warning);
}
i.mark {
display: block;
position: absolute;
@ -102,9 +80,6 @@ ul.todo-list {
}
label.todo-checkbox {
padding-left: 0;
margin-bottom: 0;
width: 100%;
padding-right: 25px;
min-height: 16px;
@ -124,8 +99,8 @@ label.todo-checkbox {
display: none;
}
body.badmin-transparent {
.todo-panel.card {
.task-todo-container.transparent {
.todo-panel.panel {
color: white;
opacity: 0.9;
}
@ -175,11 +150,6 @@ body.badmin-transparent {
-webkit-filter: blur(3px);
}
}
&.primary, &.danger,&.success, &.info, &.warning {
i.mark {
background-color: transparent;
}
}
i.remove-todo {
color: white;
opacity: 0.4;
@ -190,12 +160,12 @@ body.badmin-transparent {
}
i.mark {
min-width: 40px;
background-color: transparent;
display: none;
}
label.todo-checkbox > span {
&:before {
position: absolute;
color: white;
color: $default-text;
content: '\f10c';
float: none;
margin-right: 6px;
@ -205,11 +175,7 @@ body.badmin-transparent {
&.checked {
label.todo-checkbox > span {
&:before {
margin-right: 0;
position: absolute;
content: '';
background-size: contain;
background: url($images-root + "app/todo/check-icon.png") no-repeat;
content: '\f00c';
}
}
}

View file

@ -1,22 +1,34 @@
@import '../../../theme/sass/conf/conf';
.chart-area {
width: 300px;
height: 300px;
}
.channels-block {
width: 100%;
position: relative;
}
.channels-block.transparent {
.traffic-chart canvas{
border: 10px solid rgba(0,0,0,0.35);
box-shadow: 0 0 5px 0 rgb(0, 0, 0) inset;
border-radius: 150px;
}
.chart-bg{
position: absolute;
width: 180px;
height: 180px;
left: 60px;
top: 60px;
background-color: rgba(0,0,0,0.35);
border-radius: 100px;
}
}
.channels-info {
display: inline-block;
width: calc(100% - 370px);
margin-left: 70px;
margin-top: -20px;
}
.small-container {
.channels-info {
display: none;
@ -29,7 +41,7 @@
font-size: 18px;
opacity: 0.9;
}
.channel-number {
.channel-number{
display: inline-block;
float: right;
}
@ -44,7 +56,7 @@
.traffic-legend {
display: inline-block;
padding: 70px 0 0 0;
padding: 70px 0 0 0px;
width: 160px;
}
@ -75,10 +87,6 @@
height: 300px;
position: relative;
float: left;
//canvas{
// border: 10px solid rgba(0, 0, 0, 0.34902);
// border-radius: 180px;
//}
}
.traffic-text {
@ -109,79 +117,67 @@
border-radius: 0;
width: 100%;
margin-bottom: 0;
background-color: rgba(0, 0, 0, 0.25);
.progress-bar {
background-color: $progress-background;
box-shadow: none;
.progress-bar{
height: 4px;
background-color: white;
background-color: $progress-default;
box-shadow: none;
}
}
.legend-color {
.legend-color{
width: 30px;
height: 30px;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25);
box-shadow:0 2px 2px 0 rgba(0, 0, 0, 0.25);
position: relative;
top: 27px;
border-radius: 15px;
left: -45px;
}
.traffic-chart canvas {
border: 10px solid rgba(0, 0, 0, 0.0);
border-radius: 150px;
}
.chart-bg {
background-color: rgba(0, 0, 0, 0.35);
position: absolute;
border-radius: 100px;
width: 180px;
height: 180px;
left: 60px;
top: 60px;
}
@media (max-width: $resM) {
div.channels-info {
div.channels-info{
display: block;
width: calc(100% - 88px);
margin-top: -65px;
margin-bottom: 10px;
}
.card.medium-card.traffic-panel {
.panel.medium-panel.traffic-panel{
height: auto;
}
.traffic-chart {
.traffic-chart{
position: inherit;
float: none;
margin: 0 auto;
}
.chart-bg {
.chart-bg{
left: calc(50% - 90px);
}
}
@media (max-width: 1465px) and (min-width: 1199px) {
.channels-info {
@media (max-width: 1465px) and (min-width: 1199px){
.channels-info{
display: none;
}
.traffic-chart {
.traffic-chart{
position: inherit;
float: none;
margin: 0 auto;
}
.chart-bg {
.chart-bg{
left: calc(50% - 90px);
}
}
@media (max-width: 380px) {
.traffic-chart {
@media (max-width: 380px){
.traffic-chart{
width: 240px;
}
.canvas-holder {
.canvas-holder{
width: 240px;
height: 240px;
}
@ -190,8 +186,7 @@
top: 30px;
}
}
@media (max-width: 320px) {
@media (max-width: 320px){
.chart-bg {
left: 50px;
top: 50px;
@ -199,11 +194,3 @@
height: 142px;
}
}
body.badmin-transparent {
.traffic-chart canvas {
border: 10px solid rgba(0, 0, 0, 0.35);
box-shadow: 0 0 5px 0 rgb(0, 0, 0) inset;
border-radius: 150px;
}
}

View file

@ -7,22 +7,34 @@ export class TrafficChartService {
private _palette = layoutColors.bgColorPalette;
private _data = [
{
value: 2000,
color: this._palette.white,
highlight: this._palette.whiteDark,
label: 'Ad Campaigns',
percentage: 87,
order: 0,
},
{
value: 400,
value: 1000,
color: this._palette.gossip,
highlight: this._palette.gossipDark,
label: 'Other',
label: 'Ad Campaigns',
percentage: 17,
order: 0,
},{
value: 1400,
color: this._palette.white,
highlight: this._palette.whiteDark,
label: 'Other',
percentage: 87,
order: 1,
},
{
}, {
value: 1500,
color: this._palette.blueStone,
highlight: this._palette.blueStoneDark,
label: 'Search engines',
percentage: 22,
order: 4,
}, {
value: 1000,
color: this._palette.surfieGreen,
highlight: this._palette.surfieGreenDark,
label: 'Referral Traffic',
percentage: 70,
order: 3,
}, {
value: 1200,
color: this._palette.silverTree,
highlight: this._palette.silverTreeDark,
@ -30,22 +42,6 @@ export class TrafficChartService {
percentage: 38,
order: 2,
},
{
value: 1000,
color: this._palette.surfieGreen,
highlight: this._palette.surfieGreenDark,
label: 'Referral Traffic',
percentage: 70,
order: 3,
},
{
value: 1500,
color: this._palette.blueStone,
highlight: this._palette.blueStoneDark,
label: 'Search engines',
percentage: 22,
order: 4,
}
];
getData() {

View file

@ -1,10 +1,5 @@
@import '../../../../theme/sass/conf/conf';
.leaflet-maps {
width: 100%;
height: calc(100vh - 283px);
}
#leaflet-map {
height: calc(100vh - 283px);
}
@ -250,7 +245,7 @@
text-align: center;
text-decoration: none;
opacity: 0.8;
color: #fff;
color: $default-text;
font-size: 17px;
width: 20px;
height: 20px;
@ -280,7 +275,7 @@
.leaflet-bar .leaflet-control-zoom-in,
.leaflet-bar .leaflet-control-zoom-out {
line-height: 18px;
&:hover {
&:hover{
width: 20px;
height: 20px;
}
@ -302,7 +297,7 @@
.leaflet-control-layers {
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.4);
background: #fff;
background: $default;
}
.leaflet-control-layers-toggle {
@ -334,7 +329,7 @@
.leaflet-control-layers-expanded {
padding: 6px 10px 6px 6px;
color: #333;
background: #fff;
background: $default;
}
.leaflet-control-layers-selector {
@ -356,7 +351,7 @@
/* attribution and scale controls */
.leaflet-container .leaflet-control-attribution {
background: #fff;
background: $default;
background: rgba(255, 255, 255, 0.7);
margin: 0;
}
@ -399,7 +394,7 @@
-moz-box-sizing: content-box;
box-sizing: content-box;
background: #fff;
background: $default;
background: rgba(255, 255, 255, 0.5);
}
@ -440,7 +435,7 @@
.leaflet-popup-content {
margin: 13px 19px;
line-height: 1.4;
color: $default-text;
color: $dropdown-text;
}
.leaflet-popup-content p {
@ -520,6 +515,6 @@
/* div icon */
.leaflet-div-icon {
background: #fff;
background: $default;
border: 1px solid #666;
}

View file

@ -7,24 +7,15 @@
color: $default-text;
text-align: center;
font-size: 18px;
background-color: $border-light;
background-color: rgba($default-text, 0.3);
padding: 12px 5px;
}
}
.grid-h{
margin-top: 10px;
margin-top: 40px;
margin-bottom: 0;
&:first-child{
margin-top: 0;
}
}
body.badmin-transparent {
.show-grid div[class^=col-]{
div {
color: $default;
background-color: rgba(255, 255, 255, 0.3);
}
}
}