Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move current styles into "default theme" folder #58

Merged
merged 2 commits into from
Apr 14, 2014
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ app/scripts/libs/remotestorage.js
app/scripts/apps/settings/show/encryptView.js
app/scripts/apps/settings/show/encryptTemplate.html
app/scripts/helpers/syncStatus.js
.DS_Store
2 changes: 1 addition & 1 deletion app/styles/main.css.map

Large diffs are not rendered by default.

95 changes: 5 additions & 90 deletions app/styles/main.less
Original file line number Diff line number Diff line change
@@ -1,91 +1,6 @@
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
// app themes
@import "theme-default/theme-default.less";
// TODO: split styles into main.css and [theme].css to make easily switchable with JS. One more request should not be an issue.

@boot_dir: '../bower_components/bootstrap/less/';
@fa-font-path: "../fonts";

// Core variables and mixins
@import "@{boot_dir}variables.less";
@import "@{boot_dir}mixins.less";

// Application variables
@import "variables.less";

// Reset
@import "@{boot_dir}normalize.less";
@import "@{boot_dir}print.less";

// Core CSS
@import "@{boot_dir}scaffolding.less";
@import "@{boot_dir}type.less";
@import "@{boot_dir}code.less";
@import "@{boot_dir}grid.less";
@import "@{boot_dir}tables.less";
@import "@{boot_dir}forms.less";
@import "@{boot_dir}buttons.less";

// Components
@import "@{boot_dir}component-animations.less";
//@import "@{boot_dir}glyphicons.less";
@import "@{boot_dir}dropdowns.less";
@import "@{boot_dir}button-groups.less";
@import "@{boot_dir}input-groups.less";
@import "@{boot_dir}navs.less";
@import "@{boot_dir}navbar.less";
// @import "@{boot_dir}breadcrumbs.less";
// @import "@{boot_dir}pagination.less";
// @import "@{boot_dir}pager.less";
@import "@{boot_dir}labels.less";
@import "@{boot_dir}badges.less";
// @import "@{boot_dir}jumbotron.less";
// @import "@{boot_dir}thumbnails.less";
@import "@{boot_dir}alerts.less";
@import "@{boot_dir}progress-bars.less";
@import "@{boot_dir}media.less";
@import "@{boot_dir}list-group.less";
// @import "@{boot_dir}panels.less";
// @import "@{boot_dir}wells.less";
@import "@{boot_dir}close.less";

// Components w/ JavaScript
@import "@{boot_dir}modals.less";
// @import "@{boot_dir}tooltip.less";
// @import "@{boot_dir}popovers.less";
@import "@{boot_dir}carousel.less";

// Utility classes
@import "@{boot_dir}utilities.less";
@import "@{boot_dir}responsive-utilities.less";

// Font awesome icons
//@import "../bower_components/font-awesome/less/font-awesome.less";

// App styles
@import "styles.less";
@import "code.less";

// Forms
@import "pagedown.less";
@import "forms.less";

// Sidebars
@import "sidebar.less";

// Content
@import "content.less";

// Welcome page styles
@import "welcome.less";

// Fontello
@import "fontello/main.less";

// Responsive
@import "responsive.less";
// Welcome page styles are not part of the theme
@import "welcome.less";
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
89 changes: 89 additions & 0 deletions app/styles/theme-default/theme-default.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/


@boot_dir: '../bower_components/bootstrap/less/';
@fa-font-path: "../fonts";

// Core variables and mixins
@import "@{boot_dir}variables.less";
@import "@{boot_dir}mixins.less";

// Application variables
@import "variables.less";

// Reset
@import "@{boot_dir}normalize.less";
@import "@{boot_dir}print.less";

// Core CSS
@import "@{boot_dir}scaffolding.less";
@import "@{boot_dir}type.less";
@import "@{boot_dir}code.less";
@import "@{boot_dir}grid.less";
@import "@{boot_dir}tables.less";
@import "@{boot_dir}forms.less";
@import "@{boot_dir}buttons.less";

// Components
@import "@{boot_dir}component-animations.less";
//@import "@{boot_dir}glyphicons.less";
@import "@{boot_dir}dropdowns.less";
@import "@{boot_dir}button-groups.less";
@import "@{boot_dir}input-groups.less";
@import "@{boot_dir}navs.less";
@import "@{boot_dir}navbar.less";
// @import "@{boot_dir}breadcrumbs.less";
// @import "@{boot_dir}pagination.less";
// @import "@{boot_dir}pager.less";
@import "@{boot_dir}labels.less";
@import "@{boot_dir}badges.less";
// @import "@{boot_dir}jumbotron.less";
// @import "@{boot_dir}thumbnails.less";
@import "@{boot_dir}alerts.less";
@import "@{boot_dir}progress-bars.less";
@import "@{boot_dir}media.less";
@import "@{boot_dir}list-group.less";
// @import "@{boot_dir}panels.less";
// @import "@{boot_dir}wells.less";
@import "@{boot_dir}close.less";

// Components w/ JavaScript
@import "@{boot_dir}modals.less";
// @import "@{boot_dir}tooltip.less";
// @import "@{boot_dir}popovers.less";
@import "@{boot_dir}carousel.less";

// Utility classes
@import "@{boot_dir}utilities.less";
@import "@{boot_dir}responsive-utilities.less";

// Font awesome icons
//@import "../bower_components/font-awesome/less/font-awesome.less";

// App styles
@import "styles.less";
@import "code.less";

// Forms
@import "pagedown.less";
@import "forms.less";

// Sidebars
@import "sidebar.less";

// Content
@import "content.less";

// Fontello
@import "fontello/main.less";

// Responsive
@import "responsive.less";
File renamed without changes.