dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

font-awesome

Browse Source
This commit is contained in:
mdipierro
2018-02-24 12:31:33 -06:00
parent ee4eb3f15a
commit 9c6df11459
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/welcome/static/css/web2py-bootstrap4.css
+17
View File
@@ -321,3 +321,20 @@ td.w2p_fc,
input[type=checkbox], input[type=radio] {
margin: 4px 4px 0 0;
}
/* for backward compatbility with pre-font-awesome */
.icon.plus,.icon.arrowleft,.icon.download,.icon.trash,.icon.pen,.icon.arrowright,.icon.magnifier {
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon.plus:before { content: "\f067";}
.icon.arrowleft:before { content: "\f060";}
.icon.download:before { content: "\f019";}
.icon.trash:before { content: "\f1f8";}
.icon.pen:before { content: "\f040";}
.icon.arrowright:before { content: "\f061";}
.icon.magnifier:before { content: "\f002";}
applications/welcome/views/default/index.html
+1 -1
View File
@@ -23,7 +23,7 @@
</ol>
<center style="padding:50px">
<a class="btn btn-primary" href="{{=URL('admin','default','index')}}">
<i class="glyphicon glyphicon-cog"></i>
<i class="fa fa-cog"></i>
{{=T("admin")}}
</a>
<a class="btn btn-secondary" href="{{=URL('examples','default','index')}}">{{=T("Online examples")}}</a>
applications/welcome/views/layout.html
+1
View File
@@ -20,6 +20,7 @@
http://google.com/webmasters -->
<meta name="google-site-verification" content="">
<!-- include stylesheets -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"/>
<link rel="stylesheet" href="{{=URL('static','css/bootstrap.min.css')}}"/>
<link rel="stylesheet" href="{{=URL('static','css/web2py-bootstrap4.css')}}"/>
<link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
gluon/packages/dal
+1 -1
Submodule gluon/packages/dal updated: ccc4d4c7f8...ecb71853bf
gluon/sqlhtml.py
+4 -4
View File
@@ -2307,7 +2307,7 @@ class SQLFORM(FORM):
cornerall='',
cornertop='',
cornerbottom='',
button='button btn btn-default',
button='button btn btn-default btn-secondary',
buttontext='buttontext button',
buttonadd='icon plus icon-plus glyphicon glyphicon-plus',
buttonback='icon leftarrow icon-arrow-left glyphicon glyphicon-arrow-left',
@@ -2748,8 +2748,8 @@ class SQLFORM(FORM):
_id=skeywords_id, _class='form-control',
_onfocus="jQuery('#%s').change();jQuery('#%s').slideDown();" % (spanel_id, sfields_id) if advanced_search else ''
),
INPUT(_type='submit', _value=T('Search'), _class="btn btn-default"),
INPUT(_type='submit', _value=T('Clear'), _class="btn btn-default",
INPUT(_type='submit', _value=T('Search'), _class="btn btn-default btn-secondary"),
INPUT(_type='submit', _value=T('Clear'), _class="btn btn-default btn-secondary",
_onclick="jQuery('#%s').val('');" % skeywords_id),
*hidden_fields,
_method="GET", _action=url), search_menu)
@@ -3135,7 +3135,7 @@ class SQLFORM(FORM):
order=request.vars.order or '',
_export_type=k,
keywords=keywords or ''))
export_links.append(A(T(label), _href=link, _title=title, _class='btn btn-default'))
export_links.append(A(T(label), _href=link, _title=title, _class='btn btn-default btn-secondary'))
export_menu = \
DIV(T('Export:'), _class="w2p_export_menu", *export_links)
else: