Skip to content

Commit 883cfd2

Browse files
dragosctdragosct
committed
* 'master' of https://bitbucket.org/alexandru_paduraru/material-dashboard: added search for in navbar small change in text
2 parents f920447 + 7f4dc59 commit 883cfd2

12 files changed

+222
-851
lines changed

‎assets/css/material-dashboard.css

Lines changed: 30 additions & 491 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/sass/md/_buttons.scss

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -53,44 +53,6 @@
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-linkedin {
70-
@include social-buttons-color($social-linkedin);
71-
}
72-
&.btn-dribbble {
73-
@include social-buttons-color($social-dribbble);
74-
}
75-
&.btn-github {
76-
@include social-buttons-color($social-github);
77-
}
78-
&.btn-youtube {
79-
@include social-buttons-color($social-youtube);
80-
}
81-
&.btn-instagram {
82-
@include social-buttons-color($social-instagram);
83-
}
84-
&.btn-reddit {
85-
@include social-buttons-color($social-reddit);
86-
}
87-
&.btn-tumblr {
88-
@include social-buttons-color($social-tumblr);
89-
}
90-
&.btn-behance {
91-
@include social-buttons-color($social-behance);
92-
}
93-
9456
&:focus,
9557
&:active,
9658
&:active:focus{

‎assets/sass/md/_responsive.scss

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@
102102
}
103103

104104
.nav-mobile-menu{
105+
margin-top: 0;
106+
105107
.notification{
106108
float: left;
107109
line-height: 30px;
@@ -197,6 +199,25 @@
197199
position: relative;
198200
z-index: 4;
199201
}
202+
203+
.navbar-form{
204+
margin: 0 50px 0 0;
205+
206+
.btn{
207+
position: absolute;
208+
top: 25px;
209+
right: 15px;
210+
}
211+
}
212+
213+
.table-responsive {
214+
width: 100%;
215+
margin-bottom: 15px;
216+
overflow-x: scroll;
217+
overflow-y: hidden;
218+
-ms-overflow-style: -ms-autohiding-scrollbar;
219+
-webkit-overflow-scrolling: touch;
220+
}
200221
}
201222

202223
.nav-open .navbar-collapse{
@@ -260,33 +281,6 @@
260281
.bar3 {
261282
outline: 1px solid transparent;
262283
}
263-
.bar1 {
264-
top: 0px;
265-
@include bar-animation($topbar-back);
266-
}
267-
.bar2 {
268-
opacity: 1;
269-
}
270-
.bar3 {
271-
bottom: 0px;
272-
@include bar-animation($bottombar-back);
273-
}
274-
.toggled .bar1 {
275-
top: 6px;
276-
@include bar-animation($topbar-x);
277-
}
278-
.toggled .bar2 {
279-
opacity: 0;
280-
}
281-
.toggled .bar3 {
282-
bottom: 6px;
283-
@include bar-animation($bottombar-x);
284-
}
285-
286-
@include topbar-x-rotation();
287-
@include topbar-back-rotation();
288-
@include bottombar-x-rotation();
289-
@include bottombar-back-rotation();
290284

291285
@-webkit-keyframes fadeIn {
292286
0% {opacity: 0;}
@@ -445,6 +439,11 @@
445439

446440
//overwrite table responsive for 768px screens
447441

442+
@media (min-width: 768px){
443+
.navbar> .container-fluid .navbar-brand{
444+
margin-left: 0;
445+
}
446+
}
448447
@media (min-width: 992px){
449448
.table-full-width{
450449
margin-left: -20px;
@@ -455,15 +454,3 @@
455454
}
456455

457456
}
458-
459-
@media (max-width: 991px){
460-
.table-responsive {
461-
width: 100%;
462-
margin-bottom: 15px;
463-
overflow-x: scroll;
464-
overflow-y: hidden;
465-
-ms-overflow-style: -ms-autohiding-scrollbar;
466-
-webkit-overflow-scrolling: touch;
467-
}
468-
469-
}

‎assets/sass/md/_sidebar-and-main-panel.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
right: 10%;
122122
height: 1px;
123123
width: 80%;
124-
background-color: rgba(180,180,180, .1);
124+
background-color: rgba(180,180,180, .3);
125125

126126
}
127127

‎examples/dashboard.html

Lines changed: 22 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<nav class="navbar navbar-transparent navbar-absolute">
9898
<div class="container-fluid">
9999
<div class="navbar-header">
100-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navigation-example-2">
100+
<button type="button" class="navbar-toggle" data-toggle="collapse">
101101
<span class="sr-only">Toggle navigation</span>
102102
<span class="icon-bar"></span>
103103
<span class="icon-bar"></span>
@@ -106,11 +106,11 @@
106106
<a class="navbar-brand" href="#">Dashboard</a>
107107
</div>
108108
<div class="collapse navbar-collapse">
109-
<ul class="nav navbar-nav navbar-left">
109+
<ul class="nav navbar-nav navbar-right">
110110
<li>
111-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
111+
<a href="#pablo" class="dropdown-toggle" data-toggle="dropdown">
112112
<i class="material-icons">dashboard</i>
113-
<p class="hidden-lg hidden-md">Blablabla</p>
113+
<p class="hidden-lg hidden-md">Dashboard</p>
114114
</a>
115115
</li>
116116
<li class="dropdown">
@@ -120,47 +120,30 @@
120120
<p class="hidden-lg hidden-md">Notifications</p>
121121
</a>
122122
<ul class="dropdown-menu">
123-
<li><a href="#">Notification 1</a></li>
124-
<li><a href="#">Notification 2</a></li>
125-
<li><a href="#">Notification 3</a></li>
126-
<li><a href="#">Notification 4</a></li>
127-
<li><a href="#">Another notification</a></li>
123+
<li><a href="#">Mike John responded to your email</a></li>
124+
<li><a href="#">You have 5 new tasks</a></li>
125+
<li><a href="#">You're now friend with Andrew</a></li>
126+
<li><a href="#">Another Notification</a></li>
127+
<li><a href="#">Another One</a></li>
128128
</ul>
129129
</li>
130130
<li>
131-
<a href="">
132-
<i class="material-icons">search</i>
133-
</a>
131+
<a href="#pablo" class="dropdown-toggle" data-toggle="dropdown">
132+
<i class="material-icons">person</i>
133+
<p class="hidden-lg hidden-md">Profile</p>
134+
</a>
134135
</li>
135136
</ul>
136137

137-
<ul class="nav navbar-nav navbar-right">
138-
<li>
139-
<a href="">
140-
Account
141-
</a>
142-
</li>
143-
<li class="dropdown">
144-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
145-
Dropdown
146-
<b class="caret"></b>
147-
</a>
148-
<ul class="dropdown-menu">
149-
<li><a href="#">Action</a></li>
150-
<li><a href="#">Another action</a></li>
151-
<li><a href="#">Something</a></li>
152-
<li><a href="#">Another action</a></li>
153-
<li><a href="#">Something</a></li>
154-
<li class="divider"></li>
155-
<li><a href="#">Separated link</a></li>
156-
</ul>
157-
</li>
158-
<li>
159-
<a href="#">
160-
Log out
161-
</a>
162-
</li>
163-
</ul>
138+
<form class="navbar-form navbar-right" role="search">
139+
<div class="form-group is-empty">
140+
<input type="text" class="form-control" placeholder="Search">
141+
<span class="material-input"></span>
142+
</div>
143+
<button type="submit" class="btn btn-white btn-round btn-just-icon">
144+
<i class="material-icons">search</i><div class="ripple-container"></div>
145+
</button>
146+
</form>
164147
</div>
165148
</div>
166149
</nav>

‎examples/icons.html

Lines changed: 22 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
</div>
4545

4646
<div class="sidebar-wrapper">
47-
48-
4947
<ul class="nav">
5048
<li>
5149
<a href="dashboard.html">
@@ -97,7 +95,7 @@
9795
<nav class="navbar navbar-transparent navbar-absolute">
9896
<div class="container-fluid">
9997
<div class="navbar-header">
100-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navigation-example-2">
98+
<button type="button" class="navbar-toggle" data-toggle="collapse">
10199
<span class="sr-only">Toggle navigation</span>
102100
<span class="icon-bar"></span>
103101
<span class="icon-bar"></span>
@@ -106,11 +104,11 @@
106104
<a class="navbar-brand" href="#">Icons</a>
107105
</div>
108106
<div class="collapse navbar-collapse">
109-
<ul class="nav navbar-nav navbar-left">
107+
<ul class="nav navbar-nav navbar-right">
110108
<li>
111-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
109+
<a href="#pablo" class="dropdown-toggle" data-toggle="dropdown">
112110
<i class="material-icons">dashboard</i>
113-
<p class="hidden-lg hidden-md">Blabblaa</p>
111+
<p class="hidden-lg hidden-md">Dashboard</p>
114112
</a>
115113
</li>
116114
<li class="dropdown">
@@ -120,47 +118,30 @@
120118
<p class="hidden-lg hidden-md">Notifications</p>
121119
</a>
122120
<ul class="dropdown-menu">
123-
<li><a href="#">Notification 1</a></li>
124-
<li><a href="#">Notification 2</a></li>
125-
<li><a href="#">Notification 3</a></li>
126-
<li><a href="#">Notification 4</a></li>
127-
<li><a href="#">Another notification</a></li>
121+
<li><a href="#">Mike John responded to your email</a></li>
122+
<li><a href="#">You have 5 new tasks</a></li>
123+
<li><a href="#">You're now friend with Andrew</a></li>
124+
<li><a href="#">Another Notification</a></li>
125+
<li><a href="#">Another One</a></li>
128126
</ul>
129127
</li>
130128
<li>
131-
<a href="">
132-
<i class="material-icons">search</i>
133-
</a>
129+
<a href="#pablo" class="dropdown-toggle" data-toggle="dropdown">
130+
<i class="material-icons">person</i>
131+
<p class="hidden-lg hidden-md">Profile</p>
132+
</a>
134133
</li>
135134
</ul>
136135

137-
<ul class="nav navbar-nav navbar-right">
138-
<li>
139-
<a href="">
140-
Account
141-
</a>
142-
</li>
143-
<li class="dropdown">
144-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
145-
Dropdown
146-
<b class="caret"></b>
147-
</a>
148-
<ul class="dropdown-menu">
149-
<li><a href="#">Action</a></li>
150-
<li><a href="#">Another action</a></li>
151-
<li><a href="#">Something</a></li>
152-
<li><a href="#">Another action</a></li>
153-
<li><a href="#">Something</a></li>
154-
<li class="divider"></li>
155-
<li><a href="#">Separated link</a></li>
156-
</ul>
157-
</li>
158-
<li>
159-
<a href="#">
160-
Log out
161-
</a>
162-
</li>
163-
</ul>
136+
<form class="navbar-form navbar-right" role="search">
137+
<div class="form-group is-empty">
138+
<input type="text" class="form-control" placeholder="Search">
139+
<span class="material-input"></span>
140+
</div>
141+
<button type="submit" class="btn btn-white btn-round btn-just-icon">
142+
<i class="material-icons">search</i><div class="ripple-container"></div>
143+
</button>
144+
</form>
164145
</div>
165146
</div>
166147
</nav>

0 commit comments

Comments
 (0)