Skip to content

Commit a02db96

Browse files
dragosctdragosct
committed
* 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard: finished check documentation and classes
2 parents 9feb09c + 8982315 commit a02db96

File tree

11 files changed

+550
-859
lines changed

11 files changed

+550
-859
lines changed

‎assets/css/material-dashboard.css

Lines changed: 104 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,6 +1150,106 @@ h2.title {
11501150
background: transparent;
11511151
box-shadow: none;
11521152
}
1153+
.btn.btn-facebook,
1154+
.navbar .navbar-nav > li > a.btn.btn-facebook {
1155+
background-color: #3b5998;
1156+
color: #fff;
1157+
box-shadow: 0 2px 2px 0 rgba(59, 89, 152, 0.14), 0 3px 1px -2px rgba(59, 89, 152, 0.2), 0 1px 5px 0 rgba(59, 89, 152, 0.12);
1158+
}
1159+
.btn.btn-facebook:focus, .btn.btn-facebook:active, .btn.btn-facebook:hover,
1160+
.navbar .navbar-nav > li > a.btn.btn-facebook:focus,
1161+
.navbar .navbar-nav > li > a.btn.btn-facebook:active,
1162+
.navbar .navbar-nav > li > a.btn.btn-facebook:hover {
1163+
background-color: #3b5998;
1164+
color: #fff;
1165+
box-shadow: 0 14px 26px -12px rgba(59, 89, 152, 0.42), 0 4px 23px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(59, 89, 152, 0.2);
1166+
}
1167+
.btn.btn-facebook.btn-simple,
1168+
.navbar .navbar-nav > li > a.btn.btn-facebook.btn-simple {
1169+
color: #3b5998;
1170+
background-color: transparent;
1171+
box-shadow: none;
1172+
}
1173+
.btn.btn-twitter,
1174+
.navbar .navbar-nav > li > a.btn.btn-twitter {
1175+
background-color: #55acee;
1176+
color: #fff;
1177+
box-shadow: 0 2px 2px 0 rgba(85, 172, 238, 0.14), 0 3px 1px -2px rgba(85, 172, 238, 0.2), 0 1px 5px 0 rgba(85, 172, 238, 0.12);
1178+
}
1179+
.btn.btn-twitter:focus, .btn.btn-twitter:active, .btn.btn-twitter:hover,
1180+
.navbar .navbar-nav > li > a.btn.btn-twitter:focus,
1181+
.navbar .navbar-nav > li > a.btn.btn-twitter:active,
1182+
.navbar .navbar-nav > li > a.btn.btn-twitter:hover {
1183+
background-color: #55acee;
1184+
color: #fff;
1185+
box-shadow: 0 14px 26px -12px rgba(85, 172, 238, 0.42), 0 4px 23px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(85, 172, 238, 0.2);
1186+
}
1187+
.btn.btn-twitter.btn-simple,
1188+
.navbar .navbar-nav > li > a.btn.btn-twitter.btn-simple {
1189+
color: #55acee;
1190+
background-color: transparent;
1191+
box-shadow: none;
1192+
}
1193+
.btn.btn-pinterest,
1194+
.navbar .navbar-nav > li > a.btn.btn-pinterest {
1195+
background-color: #cc2127;
1196+
color: #fff;
1197+
box-shadow: 0 2px 2px 0 rgba(204, 33, 39, 0.14), 0 3px 1px -2px rgba(204, 33, 39, 0.2), 0 1px 5px 0 rgba(204, 33, 39, 0.12);
1198+
}
1199+
.btn.btn-pinterest:focus, .btn.btn-pinterest:active, .btn.btn-pinterest:hover,
1200+
.navbar .navbar-nav > li > a.btn.btn-pinterest:focus,
1201+
.navbar .navbar-nav > li > a.btn.btn-pinterest:active,
1202+
.navbar .navbar-nav > li > a.btn.btn-pinterest:hover {
1203+
background-color: #cc2127;
1204+
color: #fff;
1205+
box-shadow: 0 14px 26px -12px rgba(204, 33, 39, 0.42), 0 4px 23px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(204, 33, 39, 0.2);
1206+
}
1207+
.btn.btn-pinterest.btn-simple,
1208+
.navbar .navbar-nav > li > a.btn.btn-pinterest.btn-simple {
1209+
color: #cc2127;
1210+
background-color: transparent;
1211+
box-shadow: none;
1212+
}
1213+
.btn.btn-google,
1214+
.navbar .navbar-nav > li > a.btn.btn-google {
1215+
background-color: #dd4b39;
1216+
color: #fff;
1217+
box-shadow: 0 2px 2px 0 rgba(221, 75, 57, 0.14), 0 3px 1px -2px rgba(221, 75, 57, 0.2), 0 1px 5px 0 rgba(221, 75, 57, 0.12);
1218+
}
1219+
.btn.btn-google:focus, .btn.btn-google:active, .btn.btn-google:hover,
1220+
.navbar .navbar-nav > li > a.btn.btn-google:focus,
1221+
.navbar .navbar-nav > li > a.btn.btn-google:active,
1222+
.navbar .navbar-nav > li > a.btn.btn-google:hover {
1223+
background-color: #dd4b39;
1224+
color: #fff;
1225+
box-shadow: 0 14px 26px -12px rgba(221, 75, 57, 0.42), 0 4px 23px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(221, 75, 57, 0.2);
1226+
}
1227+
.btn.btn-google.btn-simple,
1228+
.navbar .navbar-nav > li > a.btn.btn-google.btn-simple {
1229+
color: #dd4b39;
1230+
background-color: transparent;
1231+
box-shadow: none;
1232+
}
1233+
.btn.btn-instagram,
1234+
.navbar .navbar-nav > li > a.btn.btn-instagram {
1235+
background-color: #125688;
1236+
color: #fff;
1237+
box-shadow: 0 2px 2px 0 rgba(18, 86, 136, 0.14), 0 3px 1px -2px rgba(18, 86, 136, 0.2), 0 1px 5px 0 rgba(18, 86, 136, 0.12);
1238+
}
1239+
.btn.btn-instagram:focus, .btn.btn-instagram:active, .btn.btn-instagram:hover,
1240+
.navbar .navbar-nav > li > a.btn.btn-instagram:focus,
1241+
.navbar .navbar-nav > li > a.btn.btn-instagram:active,
1242+
.navbar .navbar-nav > li > a.btn.btn-instagram:hover {
1243+
background-color: #125688;
1244+
color: #fff;
1245+
box-shadow: 0 14px 26px -12px rgba(18, 86, 136, 0.42), 0 4px 23px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(18, 86, 136, 0.2);
1246+
}
1247+
.btn.btn-instagram.btn-simple,
1248+
.navbar .navbar-nav > li > a.btn.btn-instagram.btn-simple {
1249+
color: #125688;
1250+
background-color: transparent;
1251+
box-shadow: none;
1252+
}
11531253
.btn:focus, .btn:active, .btn:active:focus,
11541254
.navbar .navbar-nav > li > a.btn:focus,
11551255
.navbar .navbar-nav > li > a.btn:active,
@@ -2672,10 +2772,6 @@ fieldset[disabled] .form-group.is-focused .togglebutton label {
26722772
background-color: #f44336;
26732773
box-shadow: 0 12px 20px -10px rgba(255, 152, 0, 0.28), 0 4px 20px 0px rgba(0, 0, 0, 0.12), 0 7px 8px -5px rgba(255, 152, 0, 0.2);
26742774
}
2675-
.nav-pills.nav-pills-rose > li.active > a, .nav-pills.nav-pills-rose > li.active > a:focus, .nav-pills.nav-pills-rose > li.active > a:hover {
2676-
background-color: #e91e63;
2677-
box-shadow: 0 12px 20px -10px rgba(233, 30, 99, 0.28), 0 4px 20px 0px rgba(0, 0, 0, 0.12), 0 7px 8px -5px rgba(233, 30, 99, 0.2);
2678-
}
26792775

26802776
.tab-space {
26812777
padding: 20px 0 50px 0px;
@@ -3352,6 +3448,10 @@ footer .copyright .material-icons {
33523448
position: relative;
33533449
top: 3px;
33543450
}
3451+
footer .btn {
3452+
margin-top: 0;
3453+
margin-bottom: 0;
3454+
}
33553455

33563456
.dropdown-menu {
33573457
border: 0;

‎assets/css/material-dashboard.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/demo.js

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,6 @@ demo = {
3232
});
3333
},
3434

35-
initSliders: function(){
36-
// Sliders for demo purpose
37-
$('#sliderRegular').noUiSlider({
38-
start: 40,
39-
connect: "lower",
40-
range: {
41-
min: 0,
42-
max: 100
43-
}
44-
});
45-
46-
$('#sliderDouble').noUiSlider({
47-
start: [20, 60] ,
48-
connect: true,
49-
range: {
50-
min: 0,
51-
max: 100
52-
}
53-
});
54-
},
55-
5635
initDocumentationCharts: function(){
5736
/* ----------========== Daily Sales Chart initialization For Documentation ==========---------- */
5837

‎assets/js/material-dashboard.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ md = {
133133
$sidebar_wrapper = $('.sidebar-wrapper');
134134

135135
if(!mobile_menu_initialized){
136-
console.log('intra in meniu');
137136
$navbar = $('nav').find('.navbar-collapse').first().clone(true);
138137

139138
nav_content = '';
@@ -163,7 +162,6 @@ md = {
163162

164163
mobile_menu_initialized = true;
165164
} else {
166-
console.log('window with:' + $(window).width());
167165
if($(window).width() > 991){
168166
// reset all the additions that we made for the sidebar wrapper only if the screen is bigger than 991px
169167
$sidebar_wrapper.find('.navbar-form').remove();
@@ -324,14 +322,12 @@ md = {
324322
easing: 'ease'
325323
}
326324
});
327-
console.log('seq:' + seq);
328325
}
329326
});
330327

331328
seq = 0;
332329
},
333330
startAnimationForBarChart: function(chart){
334-
console.log('chart:', chart);
335331

336332
chart.on('draw', function(data) {
337333
if(data.type === 'bar'){
@@ -345,7 +341,6 @@ md = {
345341
easing: 'ease'
346342
}
347343
});
348-
console.log('seq:' + seq2);
349344
}
350345
});
351346

‎assets/sass/md/_buttons.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,23 @@
5353
}
5454
}
5555

56+
// social buttons
57+
&.btn-facebook {
58+
@include social-buttons-color($social-facebook);
59+
}
60+
&.btn-twitter {
61+
@include social-buttons-color($social-twitter);
62+
}
63+
&.btn-pinterest {
64+
@include social-buttons-color($social-pinterest);
65+
}
66+
&.btn-google {
67+
@include social-buttons-color($social-google);
68+
}
69+
&.btn-instagram {
70+
@include social-buttons-color($social-instagram);
71+
}
72+
5673
&:focus,
5774
&:active,
5875
&:active:focus{

‎assets/sass/md/_footers.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,9 @@ footer{
3636
top: 3px;
3737
}
3838
}
39+
40+
.btn{
41+
margin-top: 0;
42+
margin-bottom: 0;
43+
}
3944
}

‎assets/sass/md/_pills.scss

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,7 @@
110110
}
111111
}
112112
}
113-
&.nav-pills-rose{
114-
> li {
115-
&.active > a{
116-
&,
117-
&:focus,
118-
&:hover{
119-
background-color: $brand-rose;
120-
@include shadow-big-color($brand-rose);
121-
}
122-
}
123-
}
124-
}
113+
125114
}
126115
.tab-space{
127116
padding: 20px 0 50px 0px;

‎documentation/css/demo-documentation.css

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ body{
1010
.tim-row{
1111
margin-bottom: 20px;
1212
}
13-
1413
.tim-white-buttons {
1514
background-color: #777777;
1615
}
@@ -21,7 +20,10 @@ body{
2120
font-weight: 500;
2221
}
2322

24-
23+
.tim-row p{
24+
font-size: 16px;
25+
line-height: 1.6em;
26+
}
2527

2628
.title.text-center{
2729
margin-bottom: 50px;
@@ -46,6 +48,9 @@ body{
4648
.tim-row{
4749
padding-top: 50px;
4850
}
51+
.tim-row-first{
52+
padding-top: 0;
53+
}
4954
.tim-row h3{
5055
margin-top: 0;
5156
}

0 commit comments

Comments
 (0)