aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-26 14:40:20 -0700
committerzotlabs <mike@macgirvin.com>2017-03-26 14:40:20 -0700
commit5cbf60320355845e2abdec0422055d3fe321e84e (patch)
tree76f88c1ef52a9f05582e0b3fac4267ab3683db73 /view/tpl
parentdc59817a9d683d9a262397f3b4d6909e44779847 (diff)
parentc327b00efa7807374776a341a7cec4023f61497b (diff)
downloadvolse-hubzilla-5cbf60320355845e2abdec0422055d3fe321e84e.tar.gz
volse-hubzilla-5cbf60320355845e2abdec0422055d3fe321e84e.tar.bz2
volse-hubzilla-5cbf60320355845e2abdec0422055d3fe321e84e.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/events_tools_side.tpl2
-rwxr-xr-xview/tpl/nav.tpl6
-rw-r--r--view/tpl/website_portation_tools.tpl2
3 files changed, 5 insertions, 5 deletions
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
index bc6f09ae8..e22f95c1e 100755
--- a/view/tpl/events_tools_side.tpl
+++ b/view/tpl/events_tools_side.tpl
@@ -8,7 +8,7 @@
<div class="sub-menu">
<form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
<div class="form-group">
- <input id="event-upload-choose" class="form-control-file w100" type="file" name="userfile" />
+ <input id="event-upload-choose" class="form-control-file w-100" type="file" name="userfile" />
</div>
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
</form>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 2544ccf52..0a9b94758 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -20,7 +20,7 @@
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
{{if $localuser}}
- <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-muted" data-toggle="collapse" data-target="#navbar-collapse-1">
+ <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1">
<i class="fa fa-exclamation-circle"></i>
</button>
{{/if}}
@@ -32,7 +32,7 @@
<div class="dropdown usermenu">
<div class="fakelink" data-toggle="dropdown">
<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
- <i class="fa fa-caret-down text-white"></i>
+ <i class="fa fa-caret-down"></i>
</div>
{{if $localuser}}
<div class="dropdown-menu">
@@ -169,7 +169,7 @@
{{/if}}
</ul>
- <div id="banner" class="navbar-text text-white font-weight-bold d-none d-md-flex">{{$banner}}</div>
+ <div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div>
<ul id="nav-right" class="navbar-nav ml-auto d-none d-md-flex">
<li class="nav-item collapse clearfix" id="nav-search">
diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl
index 4ee1376ea..0d131cb17 100644
--- a/view/tpl/website_portation_tools.tpl
+++ b/view/tpl/website_portation_tools.tpl
@@ -15,7 +15,7 @@
<!-- Or upload a zipped file containing the website -->
<p class="descriptive-text">{{$file_upload_text}}</p>
<div class="form-group">
- <input class="form-control-file w100" type="file" name="zip_file" />
+ <input class="form-control-file w-100" type="file" name="zip_file" />
</div>
<div class="form-group">
<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button>