Browse Source

Fixed compatibility with Sass 3.4 (3.4 is now required).

pull/100/head
Simon Eisenmann 11 years ago
parent
commit
3a07f38f1f
  1. 1
      .gitignore
  2. 1
      .travis.yml
  3. 4
      configure.ac
  4. 2
      src/styles/Makefile.am
  5. 4
      src/styles/config.rb
  6. 2
      src/styles/global/skins/_dark.scss
  7. 2
      src/styles/global/skins/_light.scss
  8. 21
      static/css/bootstrap.min.css
  9. 21
      static/css/font-awesome.min.css
  10. 21
      static/css/main.min.css

1
.gitignore vendored

@ -10,6 +10,7 @@
/src/styles/.sass-cache /src/styles/.sass-cache
/static/fonts/* /static/fonts/*
/static/js/main.min.js /static/js/main.min.js
/static/css/*.css.map
/tokens.txt /tokens.txt
/dist /dist
*~ *~

1
.travis.yml

@ -17,6 +17,7 @@ before_install:
install: install:
- sudo apt-get -y install nodejs rubygems python-babel - sudo apt-get -y install nodejs rubygems python-babel
- sudo gem install oj
- sudo gem install compass - sudo gem install compass
- npm install -g po2json - npm install -g po2json
- npm install -g autoprefixer - npm install -g autoprefixer

4
configure.ac

@ -36,7 +36,7 @@ AC_SUBST(I18N_BUG_ADDRESS)
GO_VERSION_MIN=1.1 GO_VERSION_MIN=1.1
NODEJS_VERSION_MIN=0.6.0 NODEJS_VERSION_MIN=0.6.0
NODEJS_VERSION_STYLES_MIN=0.10.0 NODEJS_VERSION_STYLES_MIN=0.10.0
SASS_VERSION_MIN=3.2.0 SASS_VERSION_MIN=3.3.0
AC_CONFIG_SRCDIR([src/app/spreed-webrtc-server/main.go]) AC_CONFIG_SRCDIR([src/app/spreed-webrtc-server/main.go])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
@ -136,9 +136,11 @@ AC_SUBST(COMPASS)
if test x"${SASS}" != x"" ; then if test x"${SASS}" != x"" ; then
AC_MSG_CHECKING([for compass support in sass]) AC_MSG_CHECKING([for compass support in sass])
tempfile=`mktemp` tempfile=`mktemp`
cd src/styles
$SASS --compass $tempfile > /dev/null 2> /dev/null $SASS --compass $tempfile > /dev/null 2> /dev/null
sass_compass=$? sass_compass=$?
rm $tempfile rm $tempfile
cd ../../
if test x"${sass_compass}" != x"0" ; then if test x"${sass_compass}" != x"0" ; then
AC_MSG_RESULT([not available]) AC_MSG_RESULT([not available])
AC_MSG_WARN([Please install compass so it can be used using "sass --compass ...".]) AC_MSG_WARN([Please install compass so it can be used using "sass --compass ...".])

2
src/styles/Makefile.am

@ -19,7 +19,7 @@
# #
AUTOMAKE_OPTIONS = -Wno-portability AUTOMAKE_OPTIONS = -Wno-portability
SASSFLAGS = --style=compressed --no-cache SASSFLAGS = --style=compressed --no-cache --sourcemap=none
AUTOPREFIXER_BROWSER_SUPPORT := "> 1%, last 2 versions, Firefox ESR, Opera 12.1" AUTOPREFIXER_BROWSER_SUPPORT := "> 1%, last 2 versions, Firefox ESR, Opera 12.1"
STATIC = ../../static STATIC = ../../static

4
src/styles/config.rb

@ -1,4 +1,6 @@
images_dir = "../../static/img"
project_path = "../../static/css" project_path = "../../static/css"
images_dir = "../../static/img"
sass_dir = "../../static/css"
fonts_dir = "../../static/fonts"
relative_assets = true relative_assets = true

2
src/styles/global/skins/_dark.scss

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

2
src/styles/global/skins/_light.scss

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

21
static/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

21
static/css/main.min.css vendored

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