yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00
Code Issues Releases Wiki Activity

- Adding loaders for images/fonts.

Browse source 
- More styles working now.
This commit is contained in:
Gunther Brunner 2014-03-11 20:15:18 +09:00
parent a3870f93e9
commit ca401d7b9c
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/middleware/webpack.js
View file

@ -27,6 +27,14 @@ var webpackOptions = {
module: {
loaders: [
{ test: /\.css$/, loader: 'style!css' },
{ test: /\.jpg$/, loader: "url-loader?prefix=static/&limit=10000&minetype=image/jpeg" },
{ test: /\.png$/, loader: "url-loader?prefix=static/&limit=10000&minetype=image/png" },
{ test: /\.gif$/, loader: "url-loader?prefix=static/&limit=10000&minetype=image/gif" },
{ test: /\.svg/, loader: "url-loader?prefix=static/&limit=10000&minetype=image/svg+xml" },
{ test: /\.woff$/, loader: "url-loader?prefix=static/&limit=10000&minetype=font-woff" },
{ test: /\.otf$/, loader: "url-loader?prefix=static/&limit=10000&minetype=octet-stream" },
{ test: /\.ttf$/, loader: "url-loader?prefix=static/&limit=10000&minetype=octet-stream" },
{ test: /\.eot$/, loader: "url-loader?prefix=static/&limit=10000&minetype=vnd.ms-fontobject" },
{ test: /\.jade/, loader: 'template-html-loader' },
{ test: /\.html/, loader: 'html-loader' },
{ test: /angular\.js/, loader: 'exports?angular'},
@ -44,7 +52,7 @@ var webpackOptions = {
new webpack.ResolverPlugin(
new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('.bower.json', ['main'])
)
//new webpack.optimize.UglifyJsPlugin({mangle: false})
// ,new webpack.optimize.UglifyJsPlugin({mangle: false})
]
}

2
res/app/device-list/device-list.jade
View file

@ -1,4 +1,4 @@
h1 Devices list
h2 Devices list
ul.device-list
li(ng-repeat='device in tracker.devices track by device.serial')

11
res/app/layout/index.js
View file

@ -1,10 +1,9 @@
require('style!raw!se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
require('style!raw!se7en-bootstrap-3/build/stylesheets/se7en-font.css')
require('style!raw!se7en-bootstrap-3/build/stylesheets/style.css')
require('style!raw!se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
require('se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
require('se7en-bootstrap-3/build/stylesheets/se7en-font.css')
require('se7en-bootstrap-3/build/stylesheets/style.css')
require('se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
// Temporary here:
require('fa-borderlayout')
require('fa-borderlayout/build-0.3.1/borderLayout.css')
require('fa-borderlayout/build-0.3.1/stf-style.css')
@ -12,7 +11,7 @@ require('fa-borderlayout/build-0.3.1/stf-style.css')
require('./cursor.css')
require('./stf-se7en.css')
require('style!raw!./stf-styles.css')
require('./stf-styles.css')
require('./small.css')
module.exports = angular.module('layout', [

2
res/app/layout/stf-styles.css
View file

@ -350,7 +350,7 @@ svg {
}
.stf-logo {
background: url("../../data/images/favicon128.png") no-repeat 0 0;
background: url(../../bower_components/stf-graphics/logo/exports/STF-128.png) no-repeat 0 0;
width: 32px;
height: 32px;
float: left;

10
res/app/views/index.jade
View file

@ -9,16 +9,16 @@ html
.pane-top-bar(pane, pane-anchor='north', pane-size='46px', pane-min='46px', pane-max='46px', pane-handle='')
.navbar
.container-fluid.stf-top-bar
a.stf-logo(href="/") STF2
a.stf-logo(href="/") STF
ul.nav.stf-nav
li(ng-cloak)
a(href='/#/control')
a(href='/#!/control')
span.fa.fa-mobile
| {{"Control"|translate}}
a(href='/#/devices')
a(href='/#!/devices')
span.fa.fa-sitemap
| {{"Devices"|translate}}
a(href='/#/settings')
a(href='/#!/settings')
span.fa.fa-gears
| {{"Settings"|translate}}
ul.nav.stf-nav.stf-feedback.pull-right(ng-cloak)
@ -27,7 +27,7 @@ html
button(type='button', ng-model='$root.platform', btn-radio="'web'", translate).btn.btn-sm.btn-default-outline Web
button(type='button', ng-model='$root.platform', btn-radio="'native'", translate).btn.btn-sm.btn-default-outline Native
li
a(ng-href='/#/help')
a(ng-href='/#!/help')
i.fa.fa-question-circle
| {{"Help"|translate}}
div(pane, pane-anchor='center').fill-height