Skip to content

Commit

Permalink
Header: fix dropdown panels;
Browse files Browse the repository at this point in the history 
Sidebar: remove reload icon;
Dashboard: fix color in main chart, change arrow icon color, fix justify content;
Table: fix icons, add margin on button, add colors to badges;
Notifications: fix notifications, remove icons;
Badges: set padding to 4px 8px
UPD bootstrap
  • Loading branch information
@Blari
Blari committed Oct 26, 2020
1 parent 066125b commit 01ca010
Show file tree
Hide file tree
Showing 20 changed files with 294 additions and 287 deletions.
50 changes: 26 additions & 24 deletions dist/charts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</li>
</ul>
<!-- every .sidebar-nav may have a title -->
<h5 class="sidebar-nav-title">Template <a class="action-link" href="#"><i class="glyphicon glyphicon-refresh"></i></a></h5>
<h5 class="sidebar-nav-title">Template</h5>
<ul class="sidebar-nav">
<li class="">
<!-- an example of nested submenu. basic bootstrap collapse component -->
Expand Down Expand Up @@ -153,7 +153,8 @@ <h5 class="sidebar-nav-title">Projects</h5>
</div>
</div>
</div>
</nav> <!-- This is the white navigation bar seen on the top. A bit enhanced BS navbar. See .page-controls in _base.scss. -->
</nav>
<!-- This is the white navigation bar seen on the top. A bit enhanced BS navbar. See .page-controls in _base.scss. -->
<nav class="page-controls navbar navbar-dashboard">

<div class="container-fluid">
Expand Down Expand Up @@ -213,15 +214,15 @@ <h5 class="sidebar-nav-title">Projects</h5>
<ul class="nav navbar-nav float-right">
<li class="dropdown nav-item">
<a
href="#"
role="button"
class="dropdown-toggle dropdown-toggle-notifications nav-link"
id="notifications-dropdown-toggle"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
data-position="bottom-middle-aligned"
data-disable-interaction="false"
href="#"
role="button"
class="dropdown-toggle dropdown-toggle-notifications nav-link"
id="notifications-dropdown-toggle"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
data-position="bottom-middle-aligned"
data-disable-interaction="false"
>
<span class="thumb-sm avatar float-left">
<img class="rounded-circle" src="demo/img/people/a5.jpg" alt="..." >
Expand All @@ -233,9 +234,9 @@ <h5 class="sidebar-nav-title">Projects</h5>
</span>
</a>
<div
class="dropdown-menu dropdown-menu-right animated fadeInUp py-0"
aria-labelledby="notifications-dropdown-toggle"
id="notifications-dropdown-menu"
class="dropdown-menu dropdown-menu-right animated fadeInUp py-0"
aria-labelledby="notifications-dropdown-toggle"
id="notifications-dropdown-menu"
>
<section class="card notifications">
<header class="card-header">
Expand All @@ -247,21 +248,21 @@ <h5 class="sidebar-nav-title">Projects</h5>
<!-- ajax-load plugin in action. setting data-ajax-load & data-ajax-target is the
only requirement for async reloading -->
<input type="radio" checked
data-ajax-trigger="change"
data-ajax-load="../demo/ajax/notifications.html"
data-ajax-target="#notifications-list"> Notifications
data-ajax-trigger="change"
data-ajax-load="demo/ajax/notifications.html"
data-ajax-target="#notifications-list"> Notifications
</label>
<label class="btn btn-default">
<input type="radio"
data-ajax-trigger="change"
data-ajax-load="../demo/ajax/messages.html"
data-ajax-target="#notifications-list"> Messages
data-ajax-trigger="change"
data-ajax-load="demo/ajax/messages.html"
data-ajax-target="#notifications-list"> Messages
</label>
<label class="btn btn-default">
<input type="radio"
data-ajax-trigger="change"
data-ajax-load="../demo/ajax/progress.html"
data-ajax-target="#notifications-list"> Progress
data-ajax-trigger="change"
data-ajax-load="demo/ajax/progress.html"
data-ajax-target="#notifications-list"> Progress
</label>
</div>
</header>
Expand Down Expand Up @@ -381,7 +382,8 @@ <h5 class="sidebar-nav-title">Projects</h5>
</ul>
</div>
</div>
</nav> <div class="theme-helper">
</nav>
<div class="theme-helper">
<section class="widget theme-helper-content">
<header class="theme-helper-header d-flex p-0">
<div class="theme-helper-toggler">
Expand Down
8 changes: 4 additions & 4 deletions dist/css/application.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/maps/application.min.css.map
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/demo/ajax/progress.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h6 class="no-margin mb-xs text-gray">
<strong>Urgent:</strong>
Rails 4.1.0 upgrade
</h6>
<div class="bg-gray-lighter progress">
<div class="bg-gray-lighter progress progress-xs">
<div class="progress-bar bg-primary no-margin" style="width: 60%"></div>
</div>
<span class="help-block">3 notes added by James 2h ago...</span>
Expand All @@ -15,7 +15,7 @@ <h6 class="no-margin mb-xs text-gray">
<strong>Primary:</strong>
Sing Web App
</h6>
<div class="bg-gray-lighter progress progress-sm">
<div class="bg-gray-lighter progress progress-xs">
<div class="progress-bar bg-success no-margin" style="width: 83%"></div>
</div>
<span class="help-block">verifying stable probability status</span>
Expand All @@ -31,7 +31,7 @@ <h6 class="no-margin mb-xs">
&nbsp;
Finish The Road to Hell Song
</h6>
<div class="bg-gray-lighter progress progress-sm">
<div class="bg-gray-lighter progress progress-xs">
<div class="progress-bar bg-bar-gray-light no-margin" style="width: 44%"></div>
</div>
<span class="help-block">last update: 2h ago</span>
Expand Down
50 changes: 26 additions & 24 deletions dist/icons.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</li>
</ul>
<!-- every .sidebar-nav may have a title -->
<h5 class="sidebar-nav-title">Template <a class="action-link" href="#"><i class="glyphicon glyphicon-refresh"></i></a></h5>
<h5 class="sidebar-nav-title">Template</h5>
<ul class="sidebar-nav">
<li class="">
<!-- an example of nested submenu. basic bootstrap collapse component -->
Expand Down Expand Up @@ -153,7 +153,8 @@ <h5 class="sidebar-nav-title">Projects</h5>
</div>
</div>
</div>
</nav> <!-- This is the white navigation bar seen on the top. A bit enhanced BS navbar. See .page-controls in _base.scss. -->
</nav>
<!-- This is the white navigation bar seen on the top. A bit enhanced BS navbar. See .page-controls in _base.scss. -->
<nav class="page-controls navbar navbar-dashboard">

<div class="container-fluid">
Expand Down Expand Up @@ -213,15 +214,15 @@ <h5 class="sidebar-nav-title">Projects</h5>
<ul class="nav navbar-nav float-right">
<li class="dropdown nav-item">
<a
href="#"
role="button"
class="dropdown-toggle dropdown-toggle-notifications nav-link"
id="notifications-dropdown-toggle"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
data-position="bottom-middle-aligned"
data-disable-interaction="false"
href="#"
role="button"
class="dropdown-toggle dropdown-toggle-notifications nav-link"
id="notifications-dropdown-toggle"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
data-position="bottom-middle-aligned"
data-disable-interaction="false"
>
<span class="thumb-sm avatar float-left">
<img class="rounded-circle" src="demo/img/people/a5.jpg" alt="..." >
Expand All @@ -233,9 +234,9 @@ <h5 class="sidebar-nav-title">Projects</h5>
</span>
</a>
<div
class="dropdown-menu dropdown-menu-right animated fadeInUp py-0"
aria-labelledby="notifications-dropdown-toggle"
id="notifications-dropdown-menu"
class="dropdown-menu dropdown-menu-right animated fadeInUp py-0"
aria-labelledby="notifications-dropdown-toggle"
id="notifications-dropdown-menu"
>
<section class="card notifications">
<header class="card-header">
Expand All @@ -247,21 +248,21 @@ <h5 class="sidebar-nav-title">Projects</h5>
<!-- ajax-load plugin in action. setting data-ajax-load & data-ajax-target is the
only requirement for async reloading -->
<input type="radio" checked
data-ajax-trigger="change"
data-ajax-load="../demo/ajax/notifications.html"
data-ajax-target="#notifications-list"> Notifications
data-ajax-trigger="change"
data-ajax-load="demo/ajax/notifications.html"
data-ajax-target="#notifications-list"> Notifications
</label>
<label class="btn btn-default">
<input type="radio"
data-ajax-trigger="change"
data-ajax-load="../demo/ajax/messages.html"
data-ajax-target="#notifications-list"> Messages
data-ajax-trigger="change"
data-ajax-load="demo/ajax/messages.html"
data-ajax-target="#notifications-list"> Messages
</label>
<label class="btn btn-default">
<input type="radio"
data-ajax-trigger="change"
data-ajax-load="../demo/ajax/progress.html"
data-ajax-target="#notifications-list"> Progress
data-ajax-trigger="change"
data-ajax-load="demo/ajax/progress.html"
data-ajax-target="#notifications-list"> Progress
</label>
</div>
</header>
Expand Down Expand Up @@ -381,7 +382,8 @@ <h5 class="sidebar-nav-title">Projects</h5>
</ul>
</div>
</div>
</nav> <div class="theme-helper">
</nav>
<div class="theme-helper">
<section class="widget theme-helper-content">
<header class="theme-helper-header d-flex p-0">
<div class="theme-helper-toggler">
Expand Down
Loading

0 comments on commit 01ca010

Please sign in to comment.