Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/scss_partial_branch'
Browse files Browse the repository at this point in the history
# Conflicts:
#	admin/css/support-hours-admin.min.css
#	admin/css/support-hours-admin.scss
  • Loading branch information
Levdbas committed Oct 9, 2017
2 parents cf8ee44 + 62903f6 commit 178a1c6
Show file tree
Hide file tree
Showing 8 changed files with 250 additions and 245 deletions.
53 changes: 53 additions & 0 deletions admin/css/partials/_settingsPage.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
.rwd-table {
margin: 1em 0;
min-width: 300px;

tr {
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
}
th {
display: none;
}
td {
display: block;
&:first-child {
padding-top: .5em;
}
&:last-child {
padding-bottom: .5em;
}
&.remove:before{
content:'';
width: 0;
}
&:before {
content: attr(data-th)": ";
font-weight: bold;
width: 6.5em;
display: inline-block;
@media (min-width: $breakpoint-alpha) {
display: none;
}
}
}
th, td {
text-align: left;
@media (min-width: $breakpoint-alpha) {
display: table-cell;
padding: .25em .5em;
&:first-child {
padding-left: 0;
}
&:last-child {
padding-right: 0;
}
}
}
}
.clearfix{
clear:both;
}
.currentDate{
display: none;
}
50 changes: 50 additions & 0 deletions admin/css/partials/_themes.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
.progress-bar{
&.midnight {
.rotate, .right{
background-color:#e14d43;
}
.innerCicle:hover .text{
color:#e14d43;
}
}
&.ectoplasm {
.rotate, .right{
background-color:#a3b745;
}
.innerCicle:hover .text{
color:#a3b745;
}
}
&.blue {
.rotate, .right{
background-color:#e1a948;
}
.innerCicle:hover .text{
color:#e1a948;
}
}
&.ocean {
.rotate, .right{
background-color:#9ebaa0;
}
.innerCicle:hover .text{
color:#9ebaa0;
}
}
&.coffee {
.rotate, .right{
background-color:#c7a589;
}
.innerCicle:hover .text{
color:#c7a589;
}
}
&.sunrise {
.rotate, .right{
background-color:#dd823b;
}
.innerCicle:hover .text{
color:#dd823b;
}
}
}
6 changes: 6 additions & 0 deletions admin/css/partials/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$circle-size: 400px;
$background-color: #cccccc;
$progress-color: #008ec2;
$percent: 75;
$duration: 2s;
$breakpoint-alpha: 480px;
112 changes: 112 additions & 0 deletions admin/css/partials/_widget.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
#support_hours_dashboard_widget{
h3{
margin: 1.33em 0 0;
font-size: 16px;
font-weight: bold;
}
}
.progress-bar {
position: relative;
width:100%;
padding-bottom: 100%;
.background{
background-color: $background-color;
}
.left{
background-color: $background-color;
opacity: 1;
}
.rotate{
background-color: $progress-color;
}
.right{
background-color: $progress-color;
transform: rotate(180deg);
opacity: 0;
}
div {
border-radius: 50%;
height: 100%;
position: absolute;
width: 100%;
}
.smallbr{
display: none;
}
}
.innerCicle{
width: 90%;
height: 90%;
margin: 5%;
position: absolute;
z-index: 12;
border-radius: 50%;
background: white;
transition: all 0.2s ease-in;
.textHolder{
display: block;
top: 50%;
position: relative;
.text{
text-align: center;
display: block;
color:$background-color;
font-weight: bold;
margin-top: -50px;
font-size: 35px;
transition: all 0.2s ease-in;
line-height: 50px;
position: absolute;
width: 100%;
&.small{
margin-top: -50px;
line-height: 50px;
font-size: 30px;
}
}
}
&:hover{
width: 94%;
height: 94%;
margin: 3%;
.text{
font-size: 45px;
color:$progress-color;
&.small{
font-size: 35px;
}
}
}
}

@keyframes toggle {
0% { opacity: 0; }
100% { opacity: 1; }
}

@media screen and (max-width: 870px) {
.smallbr {
display: block;
}

.bigbr {
display: none;
}


.text {
font-size: 30px;
line-height: 40px;
margin-top: -40px;
}

.progress-bar:hover .text {
font-size: 40px;
}
}
@media screen and (max-width: 800px) {
.progress-bar {
max-width:none;
max-height:none;
}
}
22 changes: 22 additions & 0 deletions admin/css/partials/_workTable.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.bold{
font-weight: bold;
color:#444;
}
.worktable{
margin-top: 20px;
padding-bottom: 10px;
margin-bottom: 10px;
th{
text-align: left;
}
}
.total{
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
margin: 0 -12px;
margin-top: 10px;
padding: 8px 12px 4px;
font-size: 1rem;
background:#fafafa;
margin-bottom: 12px;
}
2 changes: 1 addition & 1 deletion admin/css/support-hours-admin.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 178a1c6

Please sign in to comment.