Browse Source

Collapse media query mixins.

Update travis deps.

Moved autoprefixer to global binary.

Compress font-awesome and bootstrap. Fix header.

Remove spreed copywrite in _variables.scss to keep from being appended to font-awesome and bootstrap unminified code. Add sticky comment to main css.

Update makefile.

Insert copywrite header on variables.

Correct readme.

Move bootstrap scss folder.
pull/30/head
Evan Theurer 11 years ago
parent
commit
ab74d89d87
  1. 1
      .travis.yml
  2. 10
      Makefile
  3. 4
      README.md
  4. 4
      src/styles/components/_audiovideo.scss
  5. 14
      src/styles/components/_chat.scss
  6. 10
      src/styles/components/_settings.scss
  7. 4
      src/styles/components/_usability.scss
  8. 45
      src/styles/global/_mixins.scss
  9. 0
      src/styles/libs/bootstrap/bootstrap/_accordion.scss
  10. 0
      src/styles/libs/bootstrap/bootstrap/_alerts.scss
  11. 0
      src/styles/libs/bootstrap/bootstrap/_badges.scss
  12. 0
      src/styles/libs/bootstrap/bootstrap/_breadcrumbs.scss
  13. 0
      src/styles/libs/bootstrap/bootstrap/_button-groups.scss
  14. 0
      src/styles/libs/bootstrap/bootstrap/_buttons.scss
  15. 0
      src/styles/libs/bootstrap/bootstrap/_carousel.scss
  16. 0
      src/styles/libs/bootstrap/bootstrap/_close.scss
  17. 0
      src/styles/libs/bootstrap/bootstrap/_code.scss
  18. 0
      src/styles/libs/bootstrap/bootstrap/_component-animations.scss
  19. 0
      src/styles/libs/bootstrap/bootstrap/_dropdowns.scss
  20. 0
      src/styles/libs/bootstrap/bootstrap/_forms.scss
  21. 0
      src/styles/libs/bootstrap/bootstrap/_glyphicons.scss
  22. 0
      src/styles/libs/bootstrap/bootstrap/_grid.scss
  23. 0
      src/styles/libs/bootstrap/bootstrap/_hero-unit.scss
  24. 0
      src/styles/libs/bootstrap/bootstrap/_input-groups.scss
  25. 0
      src/styles/libs/bootstrap/bootstrap/_jumbotron.scss
  26. 0
      src/styles/libs/bootstrap/bootstrap/_labels-badges.scss
  27. 0
      src/styles/libs/bootstrap/bootstrap/_labels.scss
  28. 0
      src/styles/libs/bootstrap/bootstrap/_layouts.scss
  29. 0
      src/styles/libs/bootstrap/bootstrap/_list-group.scss
  30. 0
      src/styles/libs/bootstrap/bootstrap/_media.scss
  31. 0
      src/styles/libs/bootstrap/bootstrap/_mixins.scss
  32. 0
      src/styles/libs/bootstrap/bootstrap/_modals.scss
  33. 0
      src/styles/libs/bootstrap/bootstrap/_navbar.scss
  34. 0
      src/styles/libs/bootstrap/bootstrap/_navs.scss
  35. 0
      src/styles/libs/bootstrap/bootstrap/_normalize.scss
  36. 0
      src/styles/libs/bootstrap/bootstrap/_pager.scss
  37. 0
      src/styles/libs/bootstrap/bootstrap/_pagination.scss
  38. 0
      src/styles/libs/bootstrap/bootstrap/_panels.scss
  39. 0
      src/styles/libs/bootstrap/bootstrap/_popovers.scss
  40. 0
      src/styles/libs/bootstrap/bootstrap/_print.scss
  41. 0
      src/styles/libs/bootstrap/bootstrap/_progress-bars.scss
  42. 0
      src/styles/libs/bootstrap/bootstrap/_reset.scss
  43. 0
      src/styles/libs/bootstrap/bootstrap/_responsive-1200px-min.scss
  44. 0
      src/styles/libs/bootstrap/bootstrap/_responsive-767px-max.scss
  45. 0
      src/styles/libs/bootstrap/bootstrap/_responsive-768px-979px.scss
  46. 0
      src/styles/libs/bootstrap/bootstrap/_responsive-navbar.scss
  47. 0
      src/styles/libs/bootstrap/bootstrap/_responsive-utilities.scss
  48. 0
      src/styles/libs/bootstrap/bootstrap/_scaffolding.scss
  49. 0
      src/styles/libs/bootstrap/bootstrap/_sprites.scss
  50. 0
      src/styles/libs/bootstrap/bootstrap/_tables.scss
  51. 0
      src/styles/libs/bootstrap/bootstrap/_theme.scss
  52. 0
      src/styles/libs/bootstrap/bootstrap/_thumbnails.scss
  53. 0
      src/styles/libs/bootstrap/bootstrap/_tooltip.scss
  54. 0
      src/styles/libs/bootstrap/bootstrap/_type.scss
  55. 0
      src/styles/libs/bootstrap/bootstrap/_utilities.scss
  56. 0
      src/styles/libs/bootstrap/bootstrap/_variables.scss
  57. 0
      src/styles/libs/bootstrap/bootstrap/_wells.scss
  58. 0
      src/styles/libs/bootstrap/bootstrap/bootstrap.scss
  59. 48
      src/styles/libs/bootstrap/responsive.scss
  60. 2
      src/styles/main.scss
  61. 4991
      static/css/bootstrap.min.css
  62. 1326
      static/css/font-awesome.min.css

1
.travis.yml

@ -21,6 +21,7 @@ install: @@ -21,6 +21,7 @@ install:
# see https://github.com/npm/npm/issues/4379#issuecomment-31590254
- sudo npm config set ca ""
- sudo npm install -g po2json
- sudo npm install -g autoprefixer
script:
- make get

10
Makefile

@ -49,11 +49,9 @@ NODEJS_BIN_EXISTS := $(shell [ -x "$(NODEJS_BIN)" ] && echo 1 || echo 0) @@ -49,11 +49,9 @@ NODEJS_BIN_EXISTS := $(shell [ -x "$(NODEJS_BIN)" ] && echo 1 || echo 0)
ifneq ($(NODEJS_BIN_EXISTS), 1)
$(error "Can't find node.js runtime, please install / check your PATH")
endif
NPM_BIN_PATH := $(shell npm bin)
# Tools
AUTOPREFIXER := autoprefixer
AUTOPREFIXER_BROWSER_SUPPORT := "> 1%, last 2 versions, Firefox ESR, Opera 12.1, Opera 12.0"
AUTOPREFIXER_BROWSER_SUPPORT := "> 1%, last 2 versions, Firefox ESR, Opera 12.1"
build: get binary assets
@ -86,18 +84,16 @@ test: get @@ -86,18 +84,16 @@ test: get
assets: styles javascript
styles: SASSFLAGS = --style=expanded
styles:
sass --compass --scss $(SASSFLAGS) \
$(CURDIR)/src/styles/main.scss:$(CURDIR)/static/css/main.min.css
$(NPM_BIN_PATH)/$(AUTOPREFIXER) --browsers $(AUTOPREFIXER_BROWSER_SUPPORT) $(CURDIR)/static/css/main.min.css
autoprefixer --browsers $(AUTOPREFIXER_BROWSER_SUPPORT) $(CURDIR)/static/css/main.min.css
sass --compass --scss $(SASSFLAGS) \
$(CURDIR)/src/styles/bootstrap.scss:$(CURDIR)/static/css/bootstrap.min.css
sass --compass --scss $(SASSFLAGS) \
$(CURDIR)/src/styles/font-awesome.scss:$(CURDIR)/static/css/font-awesome.min.css
style-vendor-prefix-info:
$(NPM_BIN_PATH)/$(AUTOPREFIXER) --browsers $(AUTOPREFIXER_BROWSER_SUPPORT) --info
releaseassets: RJSFLAGS = generateSourceMaps=false preserveLicenseComments=true
releaseassets: SASSFLAGS = --style=compressed --no-cache
releaseassets: dist_gopath assets

4
README.md

@ -10,11 +10,11 @@ The latest version of Spreed Speak Freely can be found on GitHub: @@ -10,11 +10,11 @@ The latest version of Spreed Speak Freely can be found on GitHub:
- [Go](http://golang.org) >= 1.1.0
- [NodeJS](http://nodejs.org/)
+ [autoprefixer](https://www.npmjs.org/package/autoprefixer)
+ [po2json](https://github.com/mikeedwards/po2json)
- [Sass](http://sass-lang.com/) >= 3.2.0
- [Compass](http://compass-style.org/)
- [Babel](http://babel.pocoo.org/)
- [po2json](https://github.com/mikeedwards/po2json)
- [autoprefixer](https://www.npmjs.org/package/autoprefixer)
- make

4
src/styles/components/_audiovideo.scss

@ -40,13 +40,13 @@ @@ -40,13 +40,13 @@
display: none;
}
}
@include breakpt-only-screen($breakpoint-video-small) {
@include breakpt($breakpoint-video-small, max-width, only screen) {
right: 0;
}
}
.mainScreenshare #audiovideo {
@include breakpt-only-screen($breakpoint-video-medium) {
@include breakpt($breakpoint-video-medium, max-width, only screen) {
display: none;
}
}

14
src/styles/components/_chat.scss

@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
position: absolute;
right: 0;
top: 36px;
@include breakpt-height($breakpoint-chat-small) {
@include breakpt($breakpoint-chat-small, max-height) {
border-top: 1px solid $bordercolor;
top: 0px;
}
@ -212,7 +212,7 @@ @@ -212,7 +212,7 @@
vertical-align: middle;
white-space: nowrap;
}
@include breakpt-height($breakpoint-chat-small) {
@include breakpt($breakpoint-chat-small, max-height) {
display: none;
}
}
@ -223,7 +223,7 @@ @@ -223,7 +223,7 @@
position: absolute;
right: 0;
top: 0;
@include breakpt-height($breakpoint-chat-small) {
@include breakpt($breakpoint-chat-small, max-height) {
bottom: 45px;
}
}
@ -429,7 +429,7 @@ @@ -429,7 +429,7 @@
margin: 0 auto;
position: absolute;
right: 0;
@include breakpt-height($breakpoint-chat-small) {
@include breakpt($breakpoint-chat-small, max-height) {
height: auto;
}
}
@ -440,7 +440,7 @@ @@ -440,7 +440,7 @@
font-size:.8em;
color: $chat-typing;
height: 14px;
@include breakpt-height($breakpoint-chat-small) {
@include breakpt($breakpoint-chat-small, max-height) {
display: none;
}
}
@ -456,7 +456,7 @@ @@ -456,7 +456,7 @@
> div {
border-top: 1px solid $bordercolor;
}
@include breakpt-height($breakpoint-chat-small) {
@include breakpt($breakpoint-chat-small, max-height) {
height: auto;
}
}
@ -474,7 +474,7 @@ @@ -474,7 +474,7 @@
&:focus {
border-color: $chat-input-border-color;
}
@include breakpt-height($breakpoint-chat-small) {
@include breakpt($breakpoint-chat-small, max-height) {
max-height: 2.5em;
}
}

10
src/styles/components/_settings.scss

@ -33,13 +33,13 @@ @@ -33,13 +33,13 @@
#settings.show {
right: 0;
@include breakpt-only-screen($breakpoint-settings-medium) {
@include breakpt($breakpoint-settings-medium, max-width, only screen) {
background: white;
left: 0;
width: auto;
}
.form-actions{
@include breakpt-only-screen($breakpoint-settings-medium) {
@include breakpt($breakpoint-settings-medium, max-width, only screen) {
bottom: 0;
height: 60px;
left: 0;
@ -73,18 +73,18 @@ @@ -73,18 +73,18 @@
}
.form-horizontal {
.controls {
@include breakpt-only-screen($breakpoint-settings-medium) {
@include breakpt($breakpoint-settings-medium, max-width, only screen) {
margin-left: 110px;
}
}
.control-label {
@include breakpt-only-screen($breakpoint-settings-medium) {
@include breakpt($breakpoint-settings-medium, max-width, only screen) {
width: 100px;
word-wrap: break-word;
}
}
}
@include breakpt-only-screen($breakpoint-settings-medium) {
@include breakpt($breakpoint-settings-medium, max-width, only screen) {
padding-bottom: 10px;
}
}

4
src/styles/components/_usability.scss

@ -52,10 +52,10 @@ @@ -52,10 +52,10 @@
color: #888;
padding: 20px 0;
}
@include breakpt-only-screen($breakpoint-useability-small){
@include breakpt($breakpoint-useability-small, max-width, only screen){
display: none;
}
@include breakpt-only-screen-with-min($breakpoint-useability-small, $breakpoint-useability-large){
@include breakpt($breakpoint-useability-small, min-width, only screen, $breakpoint-useability-large){
font-size: 1em;
width: 250px;
}

45
src/styles/global/_mixins.scss

@ -1,29 +1,44 @@ @@ -1,29 +1,44 @@
@mixin breakpt($pt) {
@media (max-width: $pt) {
@content;
// not handled by autoprefixer
@mixin tap-highlight-color($color) {
-webkit-tap-highlight-color: $color;
}
/* Supports media type and up to two expressions
ex output:
@media only screen and (min-width: 700px) and (max-width: 1280px) {
.bar .middle img {
display: none;
}
}
@mixin breakpt-height($pt) {
@media (max-height: $pt) {
@param $media-value1: required - number/units
@param $media-feature1: optional - width,height,ect...
@param $media-type: optional - screen,print,ect...
@param $media-value2: optional - number/units
@param $media-feature2: optional - width,height,ect...
*/
@mixin breakpt($media-value1, $media-feature1: max-width, $media-type: null,
$media-value2: null, $media-feature2: max-width) {
@if($media-type and $media-value2) {
@media #{$media-type} and ($media-feature1: $media-value1) and ($media-feature2: $media-value2) {
@content;
}
}
@mixin breakpt-only-screen($pt) {
@media only screen and (max-width: $pt) {
@if(not $media-type and $media-value2) {
@media ($media-feature1: $media-value1) and ($media-feature2: $media-value2) {
@content;
}
}
@mixin breakpt-only-screen-with-min($pt1, $pt2) {
@media only screen and (min-width: $pt1) and (max-width: $pt2) {
@if($media-type and not $media-value2) {
@media #{$media-type} and ($media-feature1: $media-value1) {
@content;
}
}
@if(not $media-type and not $media-value2) {
@media ($media-feature1: $media-value1) {
@content;
}
}
// not handled by autoprefixer
@mixin tap-highlight-color($color) {
-webkit-tap-highlight-color: $color;
}

0
src/styles/libs/bootstrap/_accordion.scss → src/styles/libs/bootstrap/bootstrap/_accordion.scss vendored

0
src/styles/libs/bootstrap/_alerts.scss → src/styles/libs/bootstrap/bootstrap/_alerts.scss vendored

0
src/styles/libs/bootstrap/_badges.scss → src/styles/libs/bootstrap/bootstrap/_badges.scss vendored

0
src/styles/libs/bootstrap/_breadcrumbs.scss → src/styles/libs/bootstrap/bootstrap/_breadcrumbs.scss vendored

0
src/styles/libs/bootstrap/_button-groups.scss → src/styles/libs/bootstrap/bootstrap/_button-groups.scss vendored

0
src/styles/libs/bootstrap/_buttons.scss → src/styles/libs/bootstrap/bootstrap/_buttons.scss vendored

0
src/styles/libs/bootstrap/_carousel.scss → src/styles/libs/bootstrap/bootstrap/_carousel.scss vendored

0
src/styles/libs/bootstrap/_close.scss → src/styles/libs/bootstrap/bootstrap/_close.scss vendored

0
src/styles/libs/bootstrap/_code.scss → src/styles/libs/bootstrap/bootstrap/_code.scss vendored

0
src/styles/libs/bootstrap/_component-animations.scss → src/styles/libs/bootstrap/bootstrap/_component-animations.scss vendored

0
src/styles/libs/bootstrap/_dropdowns.scss → src/styles/libs/bootstrap/bootstrap/_dropdowns.scss vendored

0
src/styles/libs/bootstrap/_forms.scss → src/styles/libs/bootstrap/bootstrap/_forms.scss vendored

0
src/styles/libs/bootstrap/_glyphicons.scss → src/styles/libs/bootstrap/bootstrap/_glyphicons.scss vendored

0
src/styles/libs/bootstrap/_grid.scss → src/styles/libs/bootstrap/bootstrap/_grid.scss vendored

0
src/styles/libs/bootstrap/_hero-unit.scss → src/styles/libs/bootstrap/bootstrap/_hero-unit.scss vendored

0
src/styles/libs/bootstrap/_input-groups.scss → src/styles/libs/bootstrap/bootstrap/_input-groups.scss vendored

0
src/styles/libs/bootstrap/_jumbotron.scss → src/styles/libs/bootstrap/bootstrap/_jumbotron.scss vendored

0
src/styles/libs/bootstrap/_labels-badges.scss → src/styles/libs/bootstrap/bootstrap/_labels-badges.scss vendored

0
src/styles/libs/bootstrap/_labels.scss → src/styles/libs/bootstrap/bootstrap/_labels.scss vendored

0
src/styles/libs/bootstrap/_layouts.scss → src/styles/libs/bootstrap/bootstrap/_layouts.scss vendored

0
src/styles/libs/bootstrap/_list-group.scss → src/styles/libs/bootstrap/bootstrap/_list-group.scss vendored

0
src/styles/libs/bootstrap/_media.scss → src/styles/libs/bootstrap/bootstrap/_media.scss vendored

0
src/styles/libs/bootstrap/_mixins.scss → src/styles/libs/bootstrap/bootstrap/_mixins.scss vendored

0
src/styles/libs/bootstrap/_modals.scss → src/styles/libs/bootstrap/bootstrap/_modals.scss vendored

0
src/styles/libs/bootstrap/_navbar.scss → src/styles/libs/bootstrap/bootstrap/_navbar.scss vendored

0
src/styles/libs/bootstrap/_navs.scss → src/styles/libs/bootstrap/bootstrap/_navs.scss vendored

0
src/styles/libs/bootstrap/_normalize.scss → src/styles/libs/bootstrap/bootstrap/_normalize.scss vendored

0
src/styles/libs/bootstrap/_pager.scss → src/styles/libs/bootstrap/bootstrap/_pager.scss vendored

0
src/styles/libs/bootstrap/_pagination.scss → src/styles/libs/bootstrap/bootstrap/_pagination.scss vendored

0
src/styles/libs/bootstrap/_panels.scss → src/styles/libs/bootstrap/bootstrap/_panels.scss vendored

0
src/styles/libs/bootstrap/_popovers.scss → src/styles/libs/bootstrap/bootstrap/_popovers.scss vendored

0
src/styles/libs/bootstrap/_print.scss → src/styles/libs/bootstrap/bootstrap/_print.scss vendored

0
src/styles/libs/bootstrap/_progress-bars.scss → src/styles/libs/bootstrap/bootstrap/_progress-bars.scss vendored

0
src/styles/libs/bootstrap/_reset.scss → src/styles/libs/bootstrap/bootstrap/_reset.scss vendored

0
src/styles/libs/bootstrap/_responsive-1200px-min.scss → src/styles/libs/bootstrap/bootstrap/_responsive-1200px-min.scss vendored

0
src/styles/libs/bootstrap/_responsive-767px-max.scss → src/styles/libs/bootstrap/bootstrap/_responsive-767px-max.scss vendored

0
src/styles/libs/bootstrap/_responsive-768px-979px.scss → src/styles/libs/bootstrap/bootstrap/_responsive-768px-979px.scss vendored

0
src/styles/libs/bootstrap/_responsive-navbar.scss → src/styles/libs/bootstrap/bootstrap/_responsive-navbar.scss vendored

0
src/styles/libs/bootstrap/_responsive-utilities.scss → src/styles/libs/bootstrap/bootstrap/_responsive-utilities.scss vendored

0
src/styles/libs/bootstrap/_scaffolding.scss → src/styles/libs/bootstrap/bootstrap/_scaffolding.scss vendored

0
src/styles/libs/bootstrap/_sprites.scss → src/styles/libs/bootstrap/bootstrap/_sprites.scss vendored

0
src/styles/libs/bootstrap/_tables.scss → src/styles/libs/bootstrap/bootstrap/_tables.scss vendored

0
src/styles/libs/bootstrap/_theme.scss → src/styles/libs/bootstrap/bootstrap/_theme.scss vendored

0
src/styles/libs/bootstrap/_thumbnails.scss → src/styles/libs/bootstrap/bootstrap/_thumbnails.scss vendored

0
src/styles/libs/bootstrap/_tooltip.scss → src/styles/libs/bootstrap/bootstrap/_tooltip.scss vendored

0
src/styles/libs/bootstrap/_type.scss → src/styles/libs/bootstrap/bootstrap/_type.scss vendored

0
src/styles/libs/bootstrap/_utilities.scss → src/styles/libs/bootstrap/bootstrap/_utilities.scss vendored

0
src/styles/libs/bootstrap/_variables.scss → src/styles/libs/bootstrap/bootstrap/_variables.scss vendored

0
src/styles/libs/bootstrap/_wells.scss → src/styles/libs/bootstrap/bootstrap/_wells.scss vendored

0
src/styles/libs/bootstrap/bootstrap.scss → src/styles/libs/bootstrap/bootstrap/bootstrap.scss vendored

48
src/styles/libs/bootstrap/responsive.scss vendored

@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
/*!
* Bootstrap Responsive v2.3.2
*
* Copyright 2012 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 @twitter by @mdo and @fat.
*/
// Responsive
// For phone and tablet devices
// -------------------------------------------------------------
// REPEAT VARIABLES & MIXINS
// -------------------------
// Required since we compile the responsive stuff separately
@import "variables"; // Modify this for custom colors, font-sizes, etc
@import "mixins";
// RESPONSIVE CLASSES
// ------------------
@import "responsive-utilities";
// MEDIA QUERIES
// ------------------
// Large desktops
@import "responsive-1200px-min";
// Tablets to regular desktops
@import "responsive-768px-979px";
// Phones to portrait tablets and narrow desktops
@import "responsive-767px-max";
// RESPONSIVE NAVBAR
// ------------------
// From 979px and below, show a button to toggle navbar contents
@import "responsive-navbar";

2
src/styles/main.scss

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
/*
/*!
* Spreed Speak Freely.
* Copyright (C) 2013-2014 struktur AG
*

4991
static/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long

1326
static/css/font-awesome.min.css vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save