Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,19 @@ module.exports = function (grunt) {
},
dist: {
files: {
'dist/superdesk-ui-framework.css': 'app/styles/app.scss'
'dist/superdesk-ui-framework.core.css': 'app/styles/app.scss'
}
}
},
cssmin: {
options: {
sourceMap: true
},
dist: {
files: {
'dist/superdesk-ui-framework.min.css': [
'dist/superdesk-ui-framework.core.css'
]
}
}
},
Expand All @@ -26,6 +38,17 @@ module.exports = function (grunt) {
'node_modules/angular/angular.min.js'
]
}
},
dist: {
options: {
sourceMap: true
},
files: {
'dist/superdesk-ui-framework.js': [
'node_modules/angular-ui-bootstrap/ui-bootstrap.min.js',
'app/scripts/index.js'
]
}
}
},
connect: {
Expand All @@ -47,7 +70,7 @@ module.exports = function (grunt) {
},
sass: {
files: ['app/styles/*.scss'],
tasks: ['sass'],
tasks: ['sass', 'cssmin'],
options: {
livereload: true,
spawn: false
Expand All @@ -58,6 +81,7 @@ module.exports = function (grunt) {

grunt.registerTask('build', [
'sass',
'cssmin',
'uglify',
'connect',
'watch'
Expand Down
5 changes: 5 additions & 0 deletions app/scripts/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

angular.module('superdesk-ui', [
'ui.bootstrap'
]);
11 changes: 11 additions & 0 deletions app/styles/_helpers.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.pull-left {
float: left;
}

.pull-right {
float: right;
}

.clearfix {
@include clearfix();
}
1 change: 0 additions & 1 deletion app/styles/_labels.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/// @group label


/// Default background color for labels.
$label-background: $gray !default;

Expand Down
11 changes: 11 additions & 0 deletions app/styles/_mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@mixin clearfix {
*zoom: 1;
&:before,
&:after {
display: table;
content: "";
}
&:after {
clear: both;
}
}
20 changes: 5 additions & 15 deletions app/styles/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : Dec 9, 2016, 3:22:57 PM
Author : Nemanja Pavlovic
*/

html {
box-sizing: border-box;
}

// Set box-sizing globally to handle padding and border widths
*,
*::before,
*::after {
// Set box-sizing globally to handle padding and border widths
*,
*::before,
*::after {
box-sizing: inherit;
}
}

@import 'variables/typography';
@import 'variables/colors';
10 changes: 9 additions & 1 deletion app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
@import "mixins";
@import "helpers";
@import "variables";
@import "buttons";
@import "labels";
@import "badge";
@import "badge";

// Dropdowns
@import 'dropdowns/basic-dropdown';
@import 'dropdowns/nested-dropdown';
@import 'dropdowns/navigation-dropdown';
@import 'dropdowns/input-dropdown';
Loading