From 5ba6011581ec2ce81c8137cc2e5e501f734bc35a Mon Sep 17 00:00:00 2001 From: Shiti Saxena Date: Mon, 20 Jul 2015 10:37:27 +0530 Subject: [PATCH 1/4] Update Build.scala Corrected twitter id --- play-yeoman/project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-yeoman/project/Build.scala b/play-yeoman/project/Build.scala index a18a733..61a30f0 100644 --- a/play-yeoman/project/Build.scala +++ b/play-yeoman/project/Build.scala @@ -46,7 +46,7 @@ object ApplicationBuild extends Build { eraoferrors Shiti Saxena - https://twitter.com/Shiti + https://twitter.com/eraoferrors milliondreams From 9bccb842f852106e349e78a728bc1d40317f1ebb Mon Sep 17 00:00:00 2001 From: Shiti Saxena Date: Mon, 20 Jul 2015 10:38:15 +0530 Subject: [PATCH 2/4] Update build.sbt corrected twitter id --- sbt-yeoman/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt-yeoman/build.sbt b/sbt-yeoman/build.sbt index 1f264f2..b5489f0 100644 --- a/sbt-yeoman/build.sbt +++ b/sbt-yeoman/build.sbt @@ -55,7 +55,7 @@ pomExtra := ( eraoferrors Shiti Saxena - https://twitter.com/Shiti + https://twitter.com/eraoferrors milliondreams From c7b73499f3b300c6c641887d77305886eb59894f Mon Sep 17 00:00:00 2001 From: Shiti Date: Sun, 10 Apr 2016 12:15:25 +0530 Subject: [PATCH 3/4] upgrading to play 2.5, changed to auto-plugin, fixes #87 --- README.md | 37 +- .../app/com/tuplejump/playYeoman/Yeoman.scala | 51 +- play-yeoman/build.sbt | 43 ++ play-yeoman/project/Build.scala | 58 -- play-yeoman/project/build.properties | 2 +- play-yeoman/project/plugins.sbt | 2 +- .../app/com/tuplejump/sbt/yeoman/Yeoman.scala | 131 ++-- sbt-yeoman/build.sbt | 6 +- sbt-yeoman/project/build.properties | 2 +- yo-demo/.gitignore | 2 +- yo-demo/README.md | 2 +- yo-demo/app/controllers/Application.scala | 6 +- yo-demo/build.sbt | 8 +- yo-demo/project/build.properties | 2 +- yo-demo/project/plugins.sbt | 2 +- yo-demo/test/ApplicationSpec.scala | 33 - yo-demo/test/IntegrationSpec.scala | 28 - yo-demo/ui/Gruntfile.js | 2 +- yo-demo/ui/app/favicon.ico | Bin 4286 -> 0 bytes yo-demo/ui/app/index.html | 33 +- .../styles/_compass_twitter_bootstrap.scss | 67 -- .../_compass_twitter_bootstrap_awesome.scss | 66 -- ..._compass_twitter_bootstrap_responsive.scss | 48 -- .../compass_twitter_bootstrap/_accordion.scss | 34 - .../compass_twitter_bootstrap/_alerts.scss | 79 -- .../_breadcrumbs.scss | 24 - .../_button-groups.scss | 227 ------ .../compass_twitter_bootstrap/_buttons.scss | 233 ------ .../compass_twitter_bootstrap/_carousel.scss | 131 ---- .../compass_twitter_bootstrap/_close.scss | 31 - .../compass_twitter_bootstrap/_code.scss | 61 -- .../_component-animations.scss | 22 - .../compass_twitter_bootstrap/_dropdowns.scss | 233 ------ .../_font-awesome.scss | 535 -------------- .../compass_twitter_bootstrap/_forms.scss | 687 ------------------ .../compass_twitter_bootstrap/_grid.scss | 21 - .../compass_twitter_bootstrap/_hero-unit.scss | 25 - .../_labels-badges.scss | 79 -- .../compass_twitter_bootstrap/_layouts.scss | 16 - .../compass_twitter_bootstrap/_media.scss | 55 -- .../compass_twitter_bootstrap/_mixins.scss | 656 ----------------- .../compass_twitter_bootstrap/_modals.scss | 95 --- .../compass_twitter_bootstrap/_navbar.scss | 490 ------------- .../compass_twitter_bootstrap/_navs.scss | 391 ---------- .../compass_twitter_bootstrap/_pager.scss | 41 -- .../_pagination.scss | 121 --- .../compass_twitter_bootstrap/_popovers.scss | 129 ---- .../_progress-bars.scss | 122 ---- .../compass_twitter_bootstrap/_reset.scss | 216 ------ .../_responsive-1200px-min.scss | 28 - .../_responsive-767px-max.scss | 193 ----- .../_responsive-768px-979px.scss | 19 - .../_responsive-navbar.scss | 185 ----- .../_responsive-utilities.scss | 43 -- .../_responsive.scss | 48 -- .../_scaffolding.scss | 52 -- .../compass_twitter_bootstrap/_sprites.scss | 193 ----- .../compass_twitter_bootstrap/_tables.scss | 237 ------ .../_thumbnails.scss | 52 -- .../compass_twitter_bootstrap/_tooltip.scss | 70 -- .../compass_twitter_bootstrap/_type.scss | 235 ------ .../compass_twitter_bootstrap/_utilities.scss | 32 - .../compass_twitter_bootstrap/_variables.scss | 301 -------- .../compass_twitter_bootstrap/_wells.scss | 29 - yo-demo/ui/app/styles/main.scss | 5 - yo-demo/ui/app/styles/main.scss~ | 5 - yo-demo/ui/app/views/main.html | 2 +- yo-demo/ui/bower.json | 31 +- yo-demo/ui/karma-e2e.conf.js | 54 -- yo-demo/ui/karma.conf.js | 56 -- yo-demo/ui/test/runner.html | 10 - yo-demo/ui/test/spec/controllers/main.js | 22 - yo-demo/ui/test/spec/controllers/myhome.js | 22 - yo-injection-demo/.gitignore | 16 - yo-injection-demo/README.md | 30 - .../app/controllers/Application.scala | 27 - yo-injection-demo/app/views/index.scala.html | 7 - yo-injection-demo/app/views/main.scala.html | 15 - yo-injection-demo/build.sbt | 13 - yo-injection-demo/conf/application.conf | 62 -- yo-injection-demo/conf/routes | 25 - yo-injection-demo/project/build.properties | 1 - yo-injection-demo/project/plugins.sbt | 11 - yo-injection-demo/public/images/favicon.png | Bin 687 -> 0 bytes .../public/javascripts/jquery-1.9.0.min.js | 4 - yo-injection-demo/public/stylesheets/main.css | 0 yo-injection-demo/ui/.bowerrc | 3 - yo-injection-demo/ui/.editorconfig | 21 - yo-injection-demo/ui/.gitattributes | 1 - yo-injection-demo/ui/.gitignore | 5 - yo-injection-demo/ui/.jshintrc | 25 - yo-injection-demo/ui/Gruntfile.js | 378 ---------- yo-injection-demo/ui/app/.buildignore | 1 - yo-injection-demo/ui/app/.htaccess | 543 -------------- yo-injection-demo/ui/app/404.html | 157 ---- yo-injection-demo/ui/app/index.html | 61 -- yo-injection-demo/ui/app/index2.scala.html | 50 -- yo-injection-demo/ui/app/robots.txt | 3 - yo-injection-demo/ui/app/scripts/app.js | 21 - .../ui/app/scripts/controllers/main.js | 10 - .../ui/app/scripts/controllers/myhome.js | 10 - .../ui/app/scripts/controllers/templ.js | 4 - yo-injection-demo/ui/app/styles/main.css | 79 -- .../ui/app/views/demo.scala.html | 16 - yo-injection-demo/ui/app/views/main.html | 13 - yo-injection-demo/ui/app/views/myhome.html | 2 - .../ui/app/views/templ.scala.html | 3 - yo-injection-demo/ui/bower.json | 28 - yo-injection-demo/ui/package.json | 42 -- 109 files changed, 212 insertions(+), 8784 deletions(-) create mode 100644 play-yeoman/build.sbt delete mode 100644 play-yeoman/project/Build.scala delete mode 100644 yo-demo/test/ApplicationSpec.scala delete mode 100644 yo-demo/test/IntegrationSpec.scala delete mode 100644 yo-demo/ui/app/favicon.ico delete mode 100644 yo-demo/ui/app/styles/_compass_twitter_bootstrap.scss delete mode 100644 yo-demo/ui/app/styles/_compass_twitter_bootstrap_awesome.scss delete mode 100644 yo-demo/ui/app/styles/_compass_twitter_bootstrap_responsive.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_accordion.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_alerts.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_breadcrumbs.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_button-groups.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_buttons.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_carousel.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_close.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_code.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_component-animations.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_dropdowns.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_font-awesome.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_forms.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_grid.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_hero-unit.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_labels-badges.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_layouts.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_media.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_mixins.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_modals.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_navbar.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_navs.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_pager.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_pagination.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_popovers.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_progress-bars.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_reset.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-1200px-min.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-767px-max.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-768px-979px.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-navbar.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-utilities.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_scaffolding.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_sprites.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_tables.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_thumbnails.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_tooltip.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_type.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_utilities.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_variables.scss delete mode 100644 yo-demo/ui/app/styles/compass_twitter_bootstrap/_wells.scss delete mode 100644 yo-demo/ui/app/styles/main.scss delete mode 100644 yo-demo/ui/app/styles/main.scss~ delete mode 100644 yo-demo/ui/karma-e2e.conf.js delete mode 100644 yo-demo/ui/karma.conf.js delete mode 100644 yo-demo/ui/test/runner.html delete mode 100644 yo-demo/ui/test/spec/controllers/main.js delete mode 100644 yo-demo/ui/test/spec/controllers/myhome.js delete mode 100644 yo-injection-demo/.gitignore delete mode 100644 yo-injection-demo/README.md delete mode 100644 yo-injection-demo/app/controllers/Application.scala delete mode 100644 yo-injection-demo/app/views/index.scala.html delete mode 100644 yo-injection-demo/app/views/main.scala.html delete mode 100644 yo-injection-demo/build.sbt delete mode 100644 yo-injection-demo/conf/application.conf delete mode 100644 yo-injection-demo/conf/routes delete mode 100644 yo-injection-demo/project/build.properties delete mode 100644 yo-injection-demo/project/plugins.sbt delete mode 100644 yo-injection-demo/public/images/favicon.png delete mode 100644 yo-injection-demo/public/javascripts/jquery-1.9.0.min.js delete mode 100644 yo-injection-demo/public/stylesheets/main.css delete mode 100644 yo-injection-demo/ui/.bowerrc delete mode 100644 yo-injection-demo/ui/.editorconfig delete mode 100644 yo-injection-demo/ui/.gitattributes delete mode 100644 yo-injection-demo/ui/.gitignore delete mode 100644 yo-injection-demo/ui/.jshintrc delete mode 100644 yo-injection-demo/ui/Gruntfile.js delete mode 100644 yo-injection-demo/ui/app/.buildignore delete mode 100644 yo-injection-demo/ui/app/.htaccess delete mode 100644 yo-injection-demo/ui/app/404.html delete mode 100644 yo-injection-demo/ui/app/index.html delete mode 100644 yo-injection-demo/ui/app/index2.scala.html delete mode 100644 yo-injection-demo/ui/app/robots.txt delete mode 100644 yo-injection-demo/ui/app/scripts/app.js delete mode 100644 yo-injection-demo/ui/app/scripts/controllers/main.js delete mode 100644 yo-injection-demo/ui/app/scripts/controllers/myhome.js delete mode 100644 yo-injection-demo/ui/app/scripts/controllers/templ.js delete mode 100644 yo-injection-demo/ui/app/styles/main.css delete mode 100644 yo-injection-demo/ui/app/views/demo.scala.html delete mode 100644 yo-injection-demo/ui/app/views/main.html delete mode 100644 yo-injection-demo/ui/app/views/myhome.html delete mode 100644 yo-injection-demo/ui/app/views/templ.scala.html delete mode 100644 yo-injection-demo/ui/bower.json delete mode 100644 yo-injection-demo/ui/package.json diff --git a/README.md b/README.md index bc7d8c2..e8251ee 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ The play-compatible-version depends on the version of Playframework being used, | 2.2.x | 0.6.4 | 2.10 | | 2.3.x | 0.7.1 | 2.10, 2.11 | | 2.4.x | 0.8.1 (support for injected routes generator) | 2.11 | +| 2.5.x | 0.9.0 | 2.11 | 3) Import Yeoman classes in the project build adding the following import to `project/Build.scala`, @@ -84,6 +85,17 @@ Using >= 0.7.1 ``` +Using >= 0.9.0 (auto-plugin) + +```scala + val appSettings = Seq(version := appVersion, libraryDependencies ++= appDependencies) ++ + Yeoman.yeomanSettings + + val main = Project(appName, file(".")).enablePlugins(play.PlayScala,Yeoman).settings( + // Add your own project settings here + appSettings: _* + ) +``` Note: If you're using build.sbt instead of the full scala build, you need to place the 2 additions above into `build.sbt` as follows: @@ -123,6 +135,12 @@ lazy val root = (project in file(".")).enablePlugins(PlayScala) Yeoman.yeomanSettings ++ Yeoman.withTemplates ``` +Using >= 0.9.0 (auto-plugin) + +```scala +lazy val root = (project in file(".")).enablePlugins(PlayScala,Yeoman) +``` + 5) Add yeoman routes to the project, appending the following line in conf/routes files, ``` @@ -142,8 +160,8 @@ GET / com.tuplejump.playYeoman.Yeoman.redirectRoot(base="/ui/") ``` -If using, Play's injected routes generator, prefixing the route with `@` will work except for `yeoman.Routes`. It can be used as is. - +Note: If using 0.8.1 and Play's injected routes generator, prefixing the route with `@` will work except for `yeoman.Routes`. It can be used as is. +This is specific to version 0.8.1. From version 0.9.0, `InjectedRoutesGenerator` is default. 6) Start play/sbt in your project folder, @@ -250,18 +268,27 @@ Using >= 0.7.1 ``` +Using >= 0.9.0 + +``` +lazy val root = (project in file(".")).enablePlugins(PlayScala,Yeoman) + +Yeoman.withTemplates +``` + * Once that is done play will compile the templates from yeoman directory too, and you can use them in your controllers. This helps you keep all your UI files together under the yeoman directory ('ui' by default) -* Look at the yo-demo and yo-injection-demo projects for details! +* Look at the yo-demo! -Note: Starting from 0.7.1, play-yeoman supports compilation of views from the yeoman directory but cannot recompile them when they are modified with the server running. You will need to stop the server and start it again. +For versions 0.7.1 to 0.8.1, you need to run `grunt` prior to compile else the template code will not be generated. This is not required if you execute `dist` or `stage` directly since they have a dependency on grunt. -* If you use scala template support, you need to run grunt prior to compile else the template code will not be generated. This is not required if you execute run or stage directly since they have a dependency on grunt. +From 0.9.0 onwards, the views in yeoman directory are automatically compiled to generate template code. ### Taking it to production From 0.6.3, play-yeoman updates Play's 'stage' and 'dist' tasks to depend on the grunt task. Thus you don't need any additional step putting this in production. when you run either `sbt dist` or `sbt stage` it will automatically run grunt as part of the build! +From 0.9.0, a boolean key `runGruntInDist` has been provided for helping with Heroku. It can be set to `false` and the yeoman distDirectory should be copied manually. ### Configuring the yeoman directory paths for Play diff --git a/play-yeoman/app/com/tuplejump/playYeoman/Yeoman.scala b/play-yeoman/app/com/tuplejump/playYeoman/Yeoman.scala index 7b94370..0daa639 100644 --- a/play-yeoman/app/com/tuplejump/playYeoman/Yeoman.scala +++ b/play-yeoman/app/com/tuplejump/playYeoman/Yeoman.scala @@ -1,15 +1,20 @@ package com.tuplejump.playYeoman +import java.io.File +import javax.inject.Inject + +import controllers.Assets import play.api._ import play.api.mvc._ -import controllers.Assets -import play.api.Play.current -import java.io.File -import scala.concurrent.Future -import scala.concurrent.ExecutionContext.Implicits.global + import scala.collection.JavaConverters._ +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.Future -object Yeoman extends Controller { +class Yeoman @Inject() (environment: play.api.Environment, + devAssets: DevAssets) extends Controller { + + def at(file: String): Action[AnyContent] = atHandler(file) def index = Action.async { request => @@ -20,6 +25,9 @@ object Yeoman extends Controller { } } + def assetHandler(file: String): Action[AnyContent] = { + Assets.at("/public", file) + } def redirectRoot(base: String = "/ui/") = Action { request => @@ -30,34 +38,21 @@ object Yeoman extends Controller { } } - def assetHandler(file: String): Action[AnyContent] = { - Assets.at("/public", file) - } - - lazy val atHandler: String => Action[AnyContent] = if (Play.isProd) assetHandler(_: String) else DevAssets.assetHandler(_: String) - - def at(file: String): Action[AnyContent] = atHandler(file) - - -} - -/** - * Class added to support injected route generator (Play 2.4 onwards) - */ -class Yeoman extends Controller { - def index = Yeoman.index + lazy val atHandler: String => Action[AnyContent] = if (environment.mode==Mode.Prod) { + assetHandler(_: String) + } else devAssets.assetHandler(_: String) - def redirectRoot(base: String = "/ui/") = Yeoman.redirectRoot(base) } -object DevAssets extends Controller { +class DevAssets @Inject() (environment: play.api.Environment, + configuration: play.api.Configuration) extends Controller { // paths to the grunt compile directory or else the application directory, in order of importance - val runtimeDirs = Play.configuration.getStringList("yeoman.devDirs") + val runtimeDirs = configuration.getStringList("yeoman.devDirs") val basePaths: List[java.io.File] = runtimeDirs match { - case Some(dirs) => dirs.asScala.map(Play.application.getFile _).toList - case None => List(Play.application.getFile("ui/.tmp"), Play.application.getFile("ui/app"), + case Some(dirs) => dirs.asScala.map(environment.getFile _).toList + case None => List(environment.getFile("ui/.tmp"), environment.getFile("ui/app"), //added ui to defaults since the newer projects have bower_components in ui directory instead of ui/app/components - Play.application.getFile("ui")) + environment.getFile("ui")) } /** diff --git a/play-yeoman/build.sbt b/play-yeoman/build.sbt new file mode 100644 index 0000000..120bda1 --- /dev/null +++ b/play-yeoman/build.sbt @@ -0,0 +1,43 @@ +val appName = "play-yeoman" +val appVersion = "0.9.0" + +val main = Project(appName, file(".")).enablePlugins(PlayScala).settings( + version := appVersion, + scalaVersion in Global := "2.11.7", + // crossScalaVersions := Seq("2.11.7"), + homepage := Some(url("https://github.com/tuplejump/play-yeoman")), + organization := "com.tuplejump", + organizationName := "Tuplejump Software Pvt. Ltd.", + organizationHomepage := Some(new java.net.URL("http://www.tuplejump.com")), + licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), + publishMavenStyle := true, + publishTo <<= version { + (v: String) => + val nexus = "https://oss.sonatype.org/" + if (v.trim.endsWith("SNAPSHOT")) + Some("snapshots" at nexus + "content/repositories/snapshots") + else + Some("releases" at nexus + "service/local/staging/deploy/maven2") + }, + publishArtifact in Test := false, + pomIncludeRepository := { + _ => false + }, + pomExtra := ( + + git@github.com:tuplejump/play-yeoman.git + scm:git:git@github.com:tuplejump/play-yeoman.git + + + + eraoferrors + Shiti Saxena + https://twitter.com/eraoferrors + + + milliondreams + Rohit Rai + https://twitter.com/milliondreams + + ) +) \ No newline at end of file diff --git a/play-yeoman/project/Build.scala b/play-yeoman/project/Build.scala deleted file mode 100644 index 61a30f0..0000000 --- a/play-yeoman/project/Build.scala +++ /dev/null @@ -1,58 +0,0 @@ -import play.sbt.PlayScala -import sbt.Keys._ -import sbt._ - -object ApplicationBuild extends Build { - - val appName = "play-yeoman" - val appVersion = "0.8.1" - - val appDependencies = Seq( - // Add your project dependencies here, - //jdbc, - //anorm - ) - - val main = Project(appName, file(".")).enablePlugins(PlayScala).settings( - version := appVersion, - libraryDependencies ++= appDependencies, - // Add your own project settings here - scalaVersion in Global := "2.11.6", - crossScalaVersions := Seq("2.11.6"), - homepage := Some(url("https://github.com/tuplejump/play-yeoman")), - organization := "com.tuplejump", - organizationName := "Tuplejump Software Pvt. Ltd.", - organizationHomepage := Some(new java.net.URL("http://www.tuplejump.com")), - licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), - publishMavenStyle := true, - publishTo <<= version { - (v: String) => - val nexus = "https://oss.sonatype.org/" - if (v.trim.endsWith("SNAPSHOT")) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") - }, - publishArtifact in Test := false, - pomIncludeRepository := { - _ => false - }, - pomExtra := ( - - git@github.com:tuplejump/play-yeoman.git - scm:git:git@github.com:tuplejump/play-yeoman.git - - - - eraoferrors - Shiti Saxena - https://twitter.com/eraoferrors - - - milliondreams - Rohit Rai - https://twitter.com/milliondreams - - ) - ) -} diff --git a/play-yeoman/project/build.properties b/play-yeoman/project/build.properties index a6e117b..43b8278 100644 --- a/play-yeoman/project/build.properties +++ b/play-yeoman/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.8 +sbt.version=0.13.11 diff --git a/play-yeoman/project/plugins.sbt b/play-yeoman/project/plugins.sbt index 1f001bc..f083743 100644 --- a/play-yeoman/project/plugins.sbt +++ b/play-yeoman/project/plugins.sbt @@ -5,5 +5,5 @@ logLevel := Level.Warn resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" // Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.0") diff --git a/sbt-yeoman/app/com/tuplejump/sbt/yeoman/Yeoman.scala b/sbt-yeoman/app/com/tuplejump/sbt/yeoman/Yeoman.scala index 978aae2..050c46e 100644 --- a/sbt-yeoman/app/com/tuplejump/sbt/yeoman/Yeoman.scala +++ b/sbt-yeoman/app/com/tuplejump/sbt/yeoman/Yeoman.scala @@ -16,31 +16,70 @@ package com.tuplejump.sbt.yeoman -import sbt._ -import sbt.Keys._ import java.net.InetSocketAddress -import play.sbt.Play.autoImport._ -import PlayKeys._ -import com.typesafe.sbt.web.Import._ import com.typesafe.sbt.packager.Keys._ +import play.sbt.PlayImport.PlayKeys._ import play.sbt.PlayRunHook -import play.twirl.sbt.Import._ +import play.twirl.sbt.Import.TwirlKeys +import sbt.Keys._ +import sbt._ + +object Yeoman extends AutoPlugin { -object Yeoman extends Plugin { - val yeomanDirectory = SettingKey[File]("yeoman-directory") - val yeomanGruntfile = SettingKey[String]("yeoman-gruntfile") - val yeomanExcludes = sbt.SettingKey[Seq[String]]("yeoman-excludes") + object autoImport { + lazy val yeomanDirectory = SettingKey[File]("yeoman-directory") + lazy val yeomanGruntfile = SettingKey[String]("yeoman-gruntfile") + lazy val yeomanExcludes = sbt.SettingKey[Seq[String]]("yeoman-excludes") + lazy val forceGrunt = SettingKey[Boolean]("key to enable/disable grunt tasks with force option") + lazy val grunt = inputKey[Unit]("Task to run grunt") - val grunt = inputKey[Unit]("Task to run grunt") + lazy val runGruntInDist = SettingKey[Boolean]("key to enable/disable running grunt prior to dist/stage") + } + + import autoImport._ + import com.typesafe.sbt.web.Import._ + + def gruntDist = Def.task { + if (runGruntInDist.value) { + val result = runGrunt(yeomanDirectory.value, yeomanGruntfile.value, + forceGrunt.value).exitValue() + if (result == 0) { + result + } else throw new Exception("grunt failed") + } + } - val forceGrunt = SettingKey[Boolean]("key to enable/disable grunt tasks with force option") + def gruntClean = Def.task { + val result = runGrunt(yeomanDirectory.value, yeomanGruntfile.value, + forceGrunt.value, List("clean")).exitValue() + if (result == 0) { + result + } else throw new Exception("grunt failed") + } - private val gruntDist = TaskKey[Int]("Task to run dist grunt") - private val gruntClean = TaskKey[Unit]("Task to run grunt clean") + lazy val withTemplates = { + Seq(sourceDirectories in TwirlKeys.compileTemplates in Compile ++= Seq(yeomanDirectory.value / "dist"), + yeomanExcludes <<= (yeomanDirectory) (yd => Seq( + yd + "/dist/components/", + yd + "/dist/images/", + yd + "/dist/styles/" + )), + excludeFilter in unmanagedSources <<= + (excludeFilter in unmanagedSources, yeomanExcludes) { + (currentFilter: FileFilter, ye) => + currentFilter || new FileFilter { + def accept(pathname: File): Boolean = { + (true /: ye.map(s => pathname.getAbsolutePath.startsWith(s))) (_ && _) + } + } + }, + (compile in Compile) <<= (compile in Compile) dependsOn gruntDist + ) + } - val yeomanSettings: Seq[Def.Setting[_]] = Seq( - libraryDependencies ++= Seq("com.tuplejump" %% "play-yeoman" % "0.8.1" intransitive()), + override def projectSettings: Seq[_root_.sbt.Def.Setting[_]] = super.projectSettings ++ Seq( + libraryDependencies ++= Seq("com.tuplejump" %% "play-yeoman" % "0.9.0" intransitive()), // Where does the UI live? yeomanDirectory <<= (baseDirectory in Compile) { @@ -55,29 +94,7 @@ object Yeoman extends Plugin { val gruntFile = (yeomanGruntfile in Compile).value //stringToProcess("grunt " + (Def.spaceDelimited("").parsed).mkString(" ")).!!, val isForceEnabled = (forceGrunt in Compile).value - runGrunt(base, gruntFile, Def.spaceDelimited("").parsed.toList, isForceEnabled).exitValue() - }, - - gruntClean := { - val base = (yeomanDirectory in Compile).value - val gruntFile = (yeomanGruntfile in Compile).value - //stringToProcess("grunt " + (Def.spaceDelimited("").parsed).mkString(" ")).!!, - val isForceEnabled = (forceGrunt in Compile).value - val result = runGrunt(base, gruntFile, List("clean"), isForceEnabled = isForceEnabled).exitValue() - if (result == 0) { - result - } else throw new Exception("grunt failed") - }, - - gruntDist := { - val base = (yeomanDirectory in Compile).value - val gruntFile = (yeomanGruntfile in Compile).value - //stringToProcess("grunt " + (Def.spaceDelimited("").parsed).mkString(" ")).!!, - val isForceEnabled = (forceGrunt in Compile).value - val result = runGrunt(base, gruntFile, isForceEnabled = isForceEnabled).exitValue() - if (result == 0) { - result - } else throw new Exception("grunt failed") + runGrunt(base, gruntFile, isForceEnabled, Def.spaceDelimited("").parsed.toList).exitValue() }, dist <<= dist dependsOn gruntDist, @@ -87,7 +104,7 @@ object Yeoman extends Plugin { clean <<= clean dependsOn gruntClean, // Add the views to the dist - unmanagedResourceDirectories in Assets <+= (yeomanDirectory in Compile)(base => base / "dist"), + unmanagedResourceDirectories in Assets <+= (yeomanDirectory in Compile) (base => base / "dist"), playRunHooks <+= (yeomanDirectory, yeomanGruntfile, forceGrunt).map { (base, gruntFile, isForceEnabled) => Grunt(base, gruntFile, isForceEnabled) @@ -97,36 +114,18 @@ object Yeoman extends Plugin { commands <++= yeomanDirectory { base => Seq( - //"grunt", "bower", "yo", "npm" ).map(cmd(_, base)) - } - ) - - - val withTemplates = Seq( - sourceDirectories in TwirlKeys.compileTemplates in Compile ++= Seq(Yeoman.yeomanDirectory.value / "dist"), - yeomanExcludes <<= (yeomanDirectory)(yd => Seq( - yd + "/dist/components/", - yd + "/dist/images/", - yd + "/dist/styles/" - )), - excludeFilter in unmanagedSources <<= - (excludeFilter in unmanagedSources, yeomanExcludes) { - (currentFilter: FileFilter, ye) => - currentFilter || new FileFilter { - def accept(pathname: File): Boolean = { - (true /: ye.map(s => pathname.getAbsolutePath.startsWith(s)))(_ && _) - } - } - } + }, + runGruntInDist := true ) - private def runGrunt(base: sbt.File, gruntFile: String, - args: List[String] = List.empty, - isForceEnabled: Boolean = true): Process = { + private def runGrunt(base: sbt.File, + gruntFile: String, + isForceEnabled: Boolean = true, + args: List[String] = List.empty): Process = { //println(s"Will run: grunt --gruntfile=$gruntFile $args in ${base.getPath}") val arguments = if (isForceEnabled) { @@ -175,7 +174,7 @@ object Yeoman extends Plugin { var process: Option[Process] = None override def afterStarted(addr: InetSocketAddress): Unit = { - process = Some(runGrunt(base, gruntFile, "watch" :: Nil, isForceEnabled)) + process = Some(runGrunt(base, gruntFile, isForceEnabled, "watch" :: Nil)) } override def afterStopped(): Unit = { @@ -189,5 +188,3 @@ object Yeoman extends Plugin { } } - - diff --git a/sbt-yeoman/build.sbt b/sbt-yeoman/build.sbt index b5489f0..846f6e6 100644 --- a/sbt-yeoman/build.sbt +++ b/sbt-yeoman/build.sbt @@ -4,13 +4,13 @@ organization := "com.tuplejump" sbtPlugin := true -version := "0.8.1" +version := "0.9.0" -sbtVersion in Global := "0.13.8" +sbtVersion in Global := "0.13.11" resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.0") addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.0.2") diff --git a/sbt-yeoman/project/build.properties b/sbt-yeoman/project/build.properties index a6e117b..43b8278 100644 --- a/sbt-yeoman/project/build.properties +++ b/sbt-yeoman/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.8 +sbt.version=0.13.11 diff --git a/yo-demo/.gitignore b/yo-demo/.gitignore index 75cdc27..d7174e2 100644 --- a/yo-demo/.gitignore +++ b/yo-demo/.gitignore @@ -5,7 +5,7 @@ target tmp .history dist -/.idea +/.idea/ /*.iml /out /.idea_modules diff --git a/yo-demo/README.md b/yo-demo/README.md index 8b47fdd..4c14026 100644 --- a/yo-demo/README.md +++ b/yo-demo/README.md @@ -1,4 +1,4 @@ -This application is to demo the different features supported by the plugin. +This application is to demo the different features supported by the plugin using injected routes generator(Play 2.5). Start sbt and run the following - diff --git a/yo-demo/app/controllers/Application.scala b/yo-demo/app/controllers/Application.scala index 837f204..8f8bbc9 100644 --- a/yo-demo/app/controllers/Application.scala +++ b/yo-demo/app/controllers/Application.scala @@ -4,7 +4,7 @@ import play.api.mvc._ import play.api.libs.json._ import play.twirl.api.Html -object Application extends Controller { +class Application extends Controller { def index = Action { Ok(views.html.index("Your new application is ready.")) @@ -12,7 +12,7 @@ object Application extends Controller { def templateDemo = Action { Ok(views.html.demo("Scala template in Angular") - (Html("This is a play scala template in angular views folder which is compiled and used inplace!")) + (Html("
This is a play scala template in angular views folder which is compiled and used inplace!
")) ) } @@ -23,4 +23,4 @@ object Application extends Controller { def serveTemplate = Action { Ok(views.html.templ("Compiled from a scala template!")) } -} \ No newline at end of file +} diff --git a/yo-demo/build.sbt b/yo-demo/build.sbt index d23b2ed..c4e8baf 100644 --- a/yo-demo/build.sbt +++ b/yo-demo/build.sbt @@ -2,10 +2,10 @@ import com.tuplejump.sbt.yeoman.Yeoman name := "yo-demo" -version := "2.0.0" +version := "1.0.0" -scalaVersion := "2.11.6" +scalaVersion := "2.11.7" -lazy val root = (project in file(".")).enablePlugins(PlayScala) +lazy val root = (project in file(".")).enablePlugins(PlayScala, Yeoman) -Yeoman.yeomanSettings ++ Yeoman.withTemplates +Yeoman.withTemplates diff --git a/yo-demo/project/build.properties b/yo-demo/project/build.properties index a6e117b..43b8278 100644 --- a/yo-demo/project/build.properties +++ b/yo-demo/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.8 +sbt.version=0.13.11 diff --git a/yo-demo/project/plugins.sbt b/yo-demo/project/plugins.sbt index c26fafa..d75b177 100644 --- a/yo-demo/project/plugins.sbt +++ b/yo-demo/project/plugins.sbt @@ -7,5 +7,5 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release // Use the Play sbt plugin for Play projects addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0") -addSbtPlugin("com.tuplejump" % "sbt-yeoman" % "0.8.0") +addSbtPlugin("com.tuplejump" % "sbt-yeoman" % "0.9.0") diff --git a/yo-demo/test/ApplicationSpec.scala b/yo-demo/test/ApplicationSpec.scala deleted file mode 100644 index 1a6acc9..0000000 --- a/yo-demo/test/ApplicationSpec.scala +++ /dev/null @@ -1,33 +0,0 @@ -package test - -import org.specs2.mutable._ - -import play.api.test._ -import play.api.test.Helpers._ - -/** - * Add your spec here. - * You can mock out a whole application including requests, plugins etc. - * For more information, consult the wiki. - */ -class ApplicationSpec extends Specification { - - "Application" should { - - "send 404 on a bad request" in { - running(FakeApplication()) { - route(FakeRequest(GET, "/boum")) must beNone - } - } - - "render the index page" in { - running(FakeApplication()) { - val home = route(FakeRequest(GET, "/")).get - - status(home) must equalTo(OK) - contentType(home) must beSome.which(_ == "text/html") - contentAsString(home) must contain ("Your new application is ready.") - } - } - } -} \ No newline at end of file diff --git a/yo-demo/test/IntegrationSpec.scala b/yo-demo/test/IntegrationSpec.scala deleted file mode 100644 index dbd5165..0000000 --- a/yo-demo/test/IntegrationSpec.scala +++ /dev/null @@ -1,28 +0,0 @@ -package test - -import org.specs2.mutable._ - -import play.api.test._ -import play.api.test.Helpers._ - -/** - * add your integration spec here. - * An integration test will fire up a whole play application in a real (or headless) browser - */ -class IntegrationSpec extends Specification { - - "Application" should { - - "work from within a browser" in { - running(TestServer(3333), HTMLUNIT) { browser => - - browser.goTo("http://localhost:3333/") - - browser.pageSource must contain("Your new application is ready.") - - } - } - - } - -} \ No newline at end of file diff --git a/yo-demo/ui/Gruntfile.js b/yo-demo/ui/Gruntfile.js index a5c9b2d..d914d20 100644 --- a/yo-demo/ui/Gruntfile.js +++ b/yo-demo/ui/Gruntfile.js @@ -372,7 +372,7 @@ module.exports = function (grunt) { grunt.registerTask('default', [ 'newer:jshint', - 'test', + // 'test', 'build' ]); }; diff --git a/yo-demo/ui/app/favicon.ico b/yo-demo/ui/app/favicon.ico deleted file mode 100644 index 6527905307f19ba00762f9241f7eb535fa84a2f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmchaPe@cz6vpqQW1y54B@{_hhFD-kWPgyXjSGVaf);_51TESOlSPOdvy}@W5Q+** zs6~RrtlR}7(V|sCkP&1f7!5{Hixw@4+x@+HXSm*Z^WGalm2d8S=brO@=iGm9MyZ7P zPo)%}YN|=8W~EfSfibDm2H3qnGq$y%h@zqVv#zn@@WvhIGJ8*ECePe@roq(*vwGys z4?Q;bI~MRIM&jXu6Yg@wqQ#8&8x#z55E}ONd3<&rw_h!5AbBx{CcZ%&z736jHxFa0 zsBLqly3+dQ%MZGH{QU}GW6bsq=@$a@sXtac^<8>8uP>*+d!Qdtv&&mnKlvE_T-+SC z*QNCVwcvq%+&DDc+T}Uf(2_FavDN{-&hCpIs?aW=A$mcrzyD+9(025i1~K&uVf&w4 zItQLK9T{7k?s@bnU*&p+<^UI*aHA1aH+Fo^PAzM|xjNK09?2V(Cme7IFB(BP?7#at z(>DB3w`AUFS~=(LUBdZ>v-SG4J~%Mrfj&05Z)oj13l5tbEq4x>8+;FC0Dvr zbJY#7PS$+yE_Cf7gxqQEC@RoZX5J^}71l+`Q~qnOF4D za`lhjUuqZa-sj)EHDleV2i|mc!Ly-@7IwzPM{?pBUt(+@IHi8HTz#Iq9)9h|hrL3) zfOT#@|5$JCxmRjsOj>&kUt(m8*57|W(FoE`CX*8edYv%j=3sR5>!hvglJ#@8K6j$g z&IuUbRC_{)p}sbyx%UD6Fki;t6nDk0gT5&6Q_at7FbVVOu?4VK{oR#!kyYbCc;<4+LITzoZ8-~O5L+9MiLHL4NyME>! z;Ky7<)UR!gN_~GXhMvPMHNB;EmmIK}eHD&~cRx89jth}IM#tU%ablw0|GxfE9IjRR zl-)b-IvC#UD!IewzPL77SI>R+?}<2ERr|R2o~zCC8rJUR8>DI5*0O$6+k~wZ)Mt;b z(Hul-OFl+F))}lK&&Yi*+S2kJmHDbdBWOQnaSA6S|#* - + + @@ -19,13 +20,13 @@ -
@@ -35,31 +36,17 @@

ui

- - - - - - + - - + + - + + + diff --git a/yo-demo/ui/app/styles/_compass_twitter_bootstrap.scss b/yo-demo/ui/app/styles/_compass_twitter_bootstrap.scss deleted file mode 100644 index d412995..0000000 --- a/yo-demo/ui/app/styles/_compass_twitter_bootstrap.scss +++ /dev/null @@ -1,67 +0,0 @@ -/*! - * Bootstrap v2.2.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. - */ - -@import "compass"; - -@import "compass_twitter_bootstrap/mixins"; - -// CSS Reset -@import "compass_twitter_bootstrap/reset"; - -// Core variables and mixins -@import "compass_twitter_bootstrap/variables"; // Modify this for custom colors, font-sizes, etc - - -// Grid system and page structure -@import "compass_twitter_bootstrap/scaffolding"; -@import "compass_twitter_bootstrap/grid"; -@import "compass_twitter_bootstrap/layouts"; - -// Base CSS -@import "compass_twitter_bootstrap/type"; -@import "compass_twitter_bootstrap/code"; -@import "compass_twitter_bootstrap/forms"; -@import "compass_twitter_bootstrap/tables"; - -// Components: common -@import "compass_twitter_bootstrap/sprites"; -@import "compass_twitter_bootstrap/dropdowns"; -@import "compass_twitter_bootstrap/wells"; -@import "compass_twitter_bootstrap/component-animations"; -@import "compass_twitter_bootstrap/close"; - -// Components: Buttons & Alerts -@import "compass_twitter_bootstrap/buttons"; -@import "compass_twitter_bootstrap/button-groups"; -@import "compass_twitter_bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less - -// Components: Nav -@import "compass_twitter_bootstrap/navs"; -@import "compass_twitter_bootstrap/navbar"; -@import "compass_twitter_bootstrap/breadcrumbs"; -@import "compass_twitter_bootstrap/pagination"; -@import "compass_twitter_bootstrap/pager"; - -// Components: Popovers -@import "compass_twitter_bootstrap/modals"; -@import "compass_twitter_bootstrap/tooltip"; -@import "compass_twitter_bootstrap/popovers"; - -// Components: Misc -@import "compass_twitter_bootstrap/thumbnails"; -@import "compass_twitter_bootstrap/media"; -@import "compass_twitter_bootstrap/labels-badges"; -@import "compass_twitter_bootstrap/progress-bars"; -@import "compass_twitter_bootstrap/accordion"; -@import "compass_twitter_bootstrap/carousel"; -@import "compass_twitter_bootstrap/hero-unit"; - -// Utility classes -@import "compass_twitter_bootstrap/utilities"; // Has to be last to override when necessary diff --git a/yo-demo/ui/app/styles/_compass_twitter_bootstrap_awesome.scss b/yo-demo/ui/app/styles/_compass_twitter_bootstrap_awesome.scss deleted file mode 100644 index 7f5970d..0000000 --- a/yo-demo/ui/app/styles/_compass_twitter_bootstrap_awesome.scss +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Bootstrap v2.2.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. - */ - -@import "compass"; - -@import "compass_twitter_bootstrap/mixins"; - -// CSS Reset -@import "compass_twitter_bootstrap/reset"; - -// Core variables and mixins -@import "compass_twitter_bootstrap/variables"; // Modify this for custom colors, font-sizes, etc - - -// Grid system and page structure -@import "compass_twitter_bootstrap/scaffolding"; -@import "compass_twitter_bootstrap/grid"; -@import "compass_twitter_bootstrap/layouts"; - -// Base CSS -@import "compass_twitter_bootstrap/type"; -@import "compass_twitter_bootstrap/code"; -@import "compass_twitter_bootstrap/forms"; -@import "compass_twitter_bootstrap/tables"; - -// Components: common -@import "compass_twitter_bootstrap/font-awesome"; -@import "compass_twitter_bootstrap/dropdowns"; -@import "compass_twitter_bootstrap/wells"; -@import "compass_twitter_bootstrap/component-animations"; -@import "compass_twitter_bootstrap/close"; - -// Components: Buttons & Alerts -@import "compass_twitter_bootstrap/buttons"; -@import "compass_twitter_bootstrap/button-groups"; -@import "compass_twitter_bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less - -// Components: Nav -@import "compass_twitter_bootstrap/navs"; -@import "compass_twitter_bootstrap/navbar"; -@import "compass_twitter_bootstrap/breadcrumbs"; -@import "compass_twitter_bootstrap/pagination"; -@import "compass_twitter_bootstrap/pager"; - -// Components: Popovers -@import "compass_twitter_bootstrap/modals"; -@import "compass_twitter_bootstrap/tooltip"; -@import "compass_twitter_bootstrap/popovers"; - -// Components: Misc -@import "compass_twitter_bootstrap/thumbnails"; -@import "compass_twitter_bootstrap/labels-badges"; -@import "compass_twitter_bootstrap/progress-bars"; -@import "compass_twitter_bootstrap/accordion"; -@import "compass_twitter_bootstrap/carousel"; -@import "compass_twitter_bootstrap/hero-unit"; - -// Utility classes -@import "compass_twitter_bootstrap/utilities"; // Has to be last to override when necessary diff --git a/yo-demo/ui/app/styles/_compass_twitter_bootstrap_responsive.scss b/yo-demo/ui/app/styles/_compass_twitter_bootstrap_responsive.scss deleted file mode 100644 index bd5975e..0000000 --- a/yo-demo/ui/app/styles/_compass_twitter_bootstrap_responsive.scss +++ /dev/null @@ -1,48 +0,0 @@ -/*! - * Bootstrap Responsive v2.1.0 - * - * 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 "compass_twitter_bootstrap/variables"; // Modify this for custom colors, font-sizes, etc -@import "compass_twitter_bootstrap/mixins"; - - -// RESPONSIVE CLASSES -// ------------------ - -@import "compass_twitter_bootstrap/responsive-utilities"; - - -// MEDIA QUERIES -// ------------------ - -// Phones to portrait tablets and narrow desktops -@import "compass_twitter_bootstrap/responsive-767px-max"; - -// Tablets to regular desktops -@import "compass_twitter_bootstrap/responsive-768px-979px"; - -// Large desktops -@import "compass_twitter_bootstrap/responsive-1200px-min"; - - -// RESPONSIVE NAVBAR -// ------------------ - -// From 979px and below, show a button to toggle navbar contents -@import "compass_twitter_bootstrap/responsive-navbar"; diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_accordion.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_accordion.scss deleted file mode 100644 index 13e30d6..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_accordion.scss +++ /dev/null @@ -1,34 +0,0 @@ -// -// Accordion -// -------------------------------------------------- - - -// Parent container -.accordion { - margin-bottom: $baseLineHeight; -} - -// Group == heading + body -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - @include ctb-border-radius($baseBorderRadius); -} -.accordion-heading { - border-bottom: 0; -} -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -// General toggle styles -.accordion-toggle { - cursor: pointer; -} - -// Inner needs the styles because you can't animate properly with any styles on the element -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_alerts.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_alerts.scss deleted file mode 100644 index faac4b5..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_alerts.scss +++ /dev/null @@ -1,79 +0,0 @@ -// -// Alerts -// -------------------------------------------------- - - -// Base styles -// ------------------------- - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: $baseLineHeight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - background-color: $warningBackground; - border: 1px solid $warningBorder; - @include ctb-border-radius($baseBorderRadius); -} -.alert, -.alert h4 { - // Specified for the h4 to prevent conflicts of changing $headingsColor - color: $warningText; -} -.alert h4 { - margin: 0; -} - -// Adjust close link position -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: $baseLineHeight; -} - - -// Alternate styles -// ------------------------- - -.alert-success { - background-color: $successBackground; - border-color: $successBorder; - color: $successText; -} -.alert-success h4 { - color: $successText; -} -.alert-danger, -.alert-error { - background-color: $errorBackground; - border-color: $errorBorder; - color: $errorText; -} -.alert-danger h4, -.alert-error h4 { - color: $errorText; -} -.alert-info { - background-color: $infoBackground; - border-color: $infoBorder; - color: $infoText; -} -.alert-info h4 { - color: $infoText; -} - - -// Block alerts -// ------------------------- - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_breadcrumbs.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_breadcrumbs.scss deleted file mode 100644 index 66920d9..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_breadcrumbs.scss +++ /dev/null @@ -1,24 +0,0 @@ -// -// Breadcrumbs -// -------------------------------------------------- - - -.breadcrumb { - padding: 8px 15px; - margin: 0 0 $baseLineHeight; - list-style: none; - background-color: #f5f5f5; - @include ctb-border-radius($baseBorderRadius); - > li { - display: inline-block; - @include ctb-ie7-inline-block(); - text-shadow: 0 1px 0 $white; - > .divider { - padding: 0 5px; - color: #ccc; - } - } - > .active { - color: $grayLight; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_button-groups.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_button-groups.scss deleted file mode 100644 index 5e6c9c0..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_button-groups.scss +++ /dev/null @@ -1,227 +0,0 @@ -// -// Button groups -// -------------------------------------------------- - - -// Make the div behave like a button -.btn-group { - position: relative; - display: inline-block; - @include ctb-ie7-inline-block(); - font-size: 0; // remove as part 1 of font-size inline-block hack - vertical-align: middle; // match .btn alignment given font-size hack above - white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page) - @include ctb-ie7-restore-left-whitespace(); -} - -// Space out series of button groups -.btn-group + .btn-group { - margin-left: 5px; -} - -// Optional: Group multiple button groups together for a toolbar -.btn-toolbar { - font-size: 0; // Hack to remove whitespace that results from using inline-block - margin-top: $baseLineHeight / 2; - margin-bottom: $baseLineHeight / 2; - > .btn + .btn, - > .btn-group + .btn, - > .btn + .btn-group { - margin-left: 5px; - } -} - -// Float them, remove border radius, then re-add to first and last elements -.btn-group > .btn { - position: relative; - @include ctb-border-radius(0); -} -.btn-group > .btn + .btn { - margin-left: -1px; -} -.btn-group > .btn, -.btn-group > .dropdown-menu, -.btn-group > .popover { - font-size: $baseFontSize; // redeclare as part 2 of font-size inline-block hack -} - -// Reset fonts for other sizes -.btn-group > .btn-mini { - font-size: $fontSizeMini; -} -.btn-group > .btn-small { - font-size: $fontSizeSmall; -} -.btn-group > .btn-large { - font-size: $fontSizeLarge; -} - -// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match -.btn-group > .btn:first-child { - margin-left: 0; - @include ctb-border-top-left-radius($baseBorderRadius); - @include ctb-border-bottom-left-radius($baseBorderRadius); -} -// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - @include ctb-border-top-right-radius($baseBorderRadius); - @include ctb-border-bottom-right-radius($baseBorderRadius); -} -// Reset corners for large buttons -.btn-group > .btn.large:first-child { - margin-left: 0; - @include ctb-border-top-left-radius($borderRadiusLarge); - @include ctb-border-bottom-left-radius($borderRadiusLarge); -} -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - @include ctb-border-top-right-radius($borderRadiusLarge); - @include ctb-border-bottom-right-radius($borderRadiusLarge); -} - -// On hover/focus/active, bring the proper btn to front -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -// On active and open, don't show outline -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - - - -// Split button dropdowns -// ---------------------- - -// Give the line between buttons some depth -.btn-group > .btn + .dropdown-toggle { - padding-left: 8px; - padding-right: 8px; - @include ctb-box-shadow(#{inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)}); - *padding-top: 5px; - *padding-bottom: 5px; -} -.btn-group > .btn-mini + .dropdown-toggle { - padding-left: 5px; - padding-right: 5px; - *padding-top: 2px; - *padding-bottom: 2px; -} -.btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; -} -.btn-group > .btn-large + .dropdown-toggle { - padding-left: 12px; - padding-right: 12px; - *padding-top: 7px; - *padding-bottom: 7px; -} - -.btn-group.open { - - // The clickable button for toggling the menu - // Remove the gradient and set the same inset shadow as the :active state - .dropdown-toggle { - background-image: none; - @include ctb-box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)}); - } - - // Keep the hover's background when dropdown is open - .btn.dropdown-toggle { - background-color: $btnBackgroundHighlight; - } - .btn-primary.dropdown-toggle { - background-color: $btnPrimaryBackgroundHighlight; - } - .btn-warning.dropdown-toggle { - background-color: $btnWarningBackgroundHighlight; - } - .btn-danger.dropdown-toggle { - background-color: $btnDangerBackgroundHighlight; - } - .btn-success.dropdown-toggle { - background-color: $btnSuccessBackgroundHighlight; - } - .btn-info.dropdown-toggle { - background-color: $btnInfoBackgroundHighlight; - } - .btn-inverse.dropdown-toggle { - background-color: $btnInverseBackgroundHighlight; - } -} - - -// Reposition the caret -.btn .caret { - margin-top: 8px; - margin-left: 0; -} -// Carets in other button sizes -.btn-mini .caret, -.btn-small .caret, -.btn-large .caret { - margin-top: 6px; -} -.btn-large .caret { - border-left-width: 5px; - border-right-width: 5px; - border-top-width: 5px; -} -// Upside down carets for .dropup -.dropup .btn-large .caret { - border-bottom-width: 5px; -} - - - -// Account for other colors -.btn-primary, -.btn-warning, -.btn-danger, -.btn-info, -.btn-success, -.btn-inverse { - .caret { - border-top-color: $white; - border-bottom-color: $white; - } -} - - - -// Vertical button groups -// ---------------------- - -.btn-group-vertical { - display: inline-block; // makes buttons only take up the width they need - @include ctb-ie7-inline-block(); -} -.btn-group-vertical > .btn { - display: block; - float: none; - max-width: 100%; - @include ctb-border-radius(0); -} -.btn-group-vertical > .btn + .btn { - margin-left: 0; - margin-top: -1px; -} -.btn-group-vertical > .btn:first-child { - @include ctb-border-radius($baseBorderRadius $baseBorderRadius 0 0); -} -.btn-group-vertical > .btn:last-child { - @include ctb-border-radius(0 0 $baseBorderRadius $baseBorderRadius); -} -.btn-group-vertical > .btn-large:first-child { - @include ctb-border-radius($borderRadiusLarge $borderRadiusLarge 0 0); -} -.btn-group-vertical > .btn-large:last-child { - @include ctb-border-radius(0 0 $borderRadiusLarge $borderRadiusLarge); -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_buttons.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_buttons.scss deleted file mode 100644 index 2da3b61..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_buttons.scss +++ /dev/null @@ -1,233 +0,0 @@ -@import "compass_twitter_bootstrap/mixins"; -@import "compass_twitter_bootstrap/variables"; - -// -// Buttons -// -------------------------------------------------- - - -// Base styles -// -------------------------------------------------- - -// Core -.btn { - display: inline-block; - @include ctb-ie7-inline-block(); - padding: 4px 12px; - margin-bottom: 0; // For input.btn - font-size: $baseFontSize; - line-height: $baseLineHeight; - text-align: center; - vertical-align: middle; - cursor: pointer; - @include ctb-buttonBackground($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75)); - border: 1px solid $btnBorder; - *border: 0; // Remove the border to prevent IE7's black border on input:focus - border-bottom-color: darken($btnBorder, 10%); - @include ctb-border-radius($baseBorderRadius); - @include ctb-ie7-restore-left-whitespace(); // Give IE7 some love - @include ctb-box-shadow(#{inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)}); - - // Hover state - &:hover { - color: $grayDark; - text-decoration: none; - background-position: 0 -15px; - - // transition is only when going to hover, otherwise the background - // behind the gradient (there for IE<=9 fallback) gets mismatched - @include ctb-transition(background-position .1s linear); - } - - // Focus state for keyboard and accessibility - &:focus { - @include ctb-tab-focus(); - } - - // Active state - &.active, - &:active { - background-image: none; - outline: 0; - @include ctb-box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)}); - } - - // Disabled state - &.disabled, - &[disabled] { - cursor: default; - background-image: none; - @include ctb-opacity(65); - @include ctb-box-shadow(none); - } - -} - - - -// Button Sizes -// -------------------------------------------------- - -// Large -.btn-large { - padding: $paddingLarge; - font-size: $fontSizeLarge; - @include ctb-border-radius($borderRadiusLarge); -} -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { - margin-top: 4px; -} - -// Small -.btn-small { - padding: $paddingSmall; - font-size: $fontSizeSmall; - @include ctb-border-radius($borderRadiusSmall); -} -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { - margin-top: -1px; -} - -// Mini -.btn-mini { - padding: $paddingMini; - font-size: $fontSizeMini; - @include ctb-border-radius($borderRadiusSmall); -} - - -// Block button -// ------------------------- - -.btn-block { - display: block; - width: 100%; - padding-left: 0; - padding-right: 0; - @include ctb-box-sizing(border-box); -} - -// Vertically space out multiple block buttons -.btn-block + .btn-block { - margin-top: 5px; -} - -// Specificity overrides -input[type="submit"], -input[type="reset"], -input[type="button"] { - &.btn-block { - width: 100%; - } -} - - - -// Alternate buttons -// -------------------------------------------------- - -// Provide *some* extra contrast for those who can get it -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255,255,255,.75); -} - -// Set the backgrounds -// ------------------------- -.btn { - // reset here as of 2.0.3 due to Recess property order - border-color: #c5c5c5; - border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); -} -.btn-primary { - @include ctb-buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight); -} -// Warning appears are orange -.btn-warning { - @include ctb-buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight); -} -// Danger and error appear as red -.btn-danger { - @include ctb-buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight); -} -// Success appears as green -.btn-success { - @include ctb-buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight); -} -// Info appears as a neutral blue -.btn-info { - @include ctb-buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight); -} -// Inverse appears as dark gray -.btn-inverse { - @include ctb-buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight); -} - - -// Cross-browser Jank -// -------------------------------------------------- - -button.btn, -input[type="submit"].btn { - - // Firefox 3.6 only I believe - &::-moz-focus-inner { - padding: 0; - border: 0; - } - - // IE7 has some default padding on button controls - *padding-top: 3px; - *padding-bottom: 3px; - - &.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; - } - &.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; - } - &.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; - } -} - - -// Link buttons -// -------------------------------------------------- - -// Make a button look and behave like a link -.btn-link, -.btn-link:active, -.btn-link[disabled] { - background-color: transparent; - background-image: none; - @include ctb-box-shadow(none); -} -.btn-link { - border-color: transparent; - cursor: pointer; - color: $linkColor; - @include ctb-border-radius(0); -} -.btn-link:hover { - color: $linkColorHover; - text-decoration: underline; - background-color: transparent; -} -.btn-link[disabled]:hover { - color: $grayDark; - text-decoration: none; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_carousel.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_carousel.scss deleted file mode 100644 index 9078784..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_carousel.scss +++ /dev/null @@ -1,131 +0,0 @@ -// -// Carousel -// -------------------------------------------------- - - -.carousel { - position: relative; - margin-bottom: $baseLineHeight; - line-height: 1; -} - -.carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} - -.carousel-inner { - - > .item { - display: none; - position: relative; - @include ctb-transition(.6s ease-in-out left); - } - - // Account for jankitude on images - > .item > img { - display: block; - line-height: 1; - } - - > .active, - > .next, - > .prev { display: block; } - - > .active { - left: 0; - } - - > .next, - > .prev { - position: absolute; - top: 0; - width: 100%; - } - - > .next { - left: 100%; - } - > .prev { - left: -100%; - } - > .next.left, - > .prev.right { - left: 0; - } - - > .active.left { - left: -100%; - } - > .active.right { - left: 100%; - } - -} - -// Left/right controls for nav -// --------------------------- - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: $white; - text-align: center; - background: $grayDarker; - border: 3px solid $white; - @include ctb-border-radius(23px); - @include ctb-opacity(50); - - // we can't have this transition here - // because webkit cancels the carousel - // animation if you trip this while - // in the middle of another animation - // ;_; - // @include ctb-transition(opacity .2s linear); - - // Reposition the right one - &.right { - left: auto; - right: 15px; - } - - // Hover state - &:hover { - color: $white; - text-decoration: none; - @include ctb-opacity(90); - } -} - - -// Caption for text below images -// ----------------------------- - -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 15px; - background: $grayDark; - background: rgba(0,0,0,.75); -} -.carousel-caption h4, -.carousel-caption p { - color: $white; - line-height: $baseLineHeight; -} -.carousel-caption h4 { - margin: 0 0 5px; -} -.carousel-caption p { - margin-bottom: 0; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_close.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_close.scss deleted file mode 100644 index a577550..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_close.scss +++ /dev/null @@ -1,31 +0,0 @@ -// -// Close icons -// -------------------------------------------------- - - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: $baseLineHeight; - color: $black; - text-shadow: 0 1px 0 rgba(255,255,255,1); - @include ctb-opacity(20); - &:hover { - color: $black; - text-decoration: none; - cursor: pointer; - @include ctb-opacity(40); - } -} - -// Additional properties for button version -// iOS requires the button element instead of an anchor tag. -// If you want the anchor version, it requires `href="#"`. -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} \ No newline at end of file diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_code.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_code.scss deleted file mode 100644 index d4441b6..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_code.scss +++ /dev/null @@ -1,61 +0,0 @@ -// -// Code (inline and blocK) -// -------------------------------------------------- - - -// Inline and block code styles -code, -pre { - padding: 0 3px 2px; - @include ctb-font-family-monospace; - font-size: $baseFontSize - 2; - color: $grayDark; - @include ctb-border-radius(3px); -} - -// Inline code -code { - padding: 2px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; - white-space: nowrap; -} - -// Blocks of code -pre { - display: block; - padding: ($baseLineHeight - 1) / 2; - margin: 0 0 $baseLineHeight / 2; - font-size: $baseFontSize - 1; // 14px to 13px - line-height: $baseLineHeight; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; // fallback for IE7-8 - border: 1px solid rgba(0,0,0,.15); - @include ctb-border-radius($baseBorderRadius); - - // Make prettyprint styles more spaced out for readability - &.prettyprint { - margin-bottom: $baseLineHeight; - } - - // Account for some code outputs that place code tags in pre tags - code { - padding: 0; - color: inherit; - white-space: pre; - white-space: pre-wrap; - background-color: transparent; - border: 0; - } -} - -// Enable scrollable blocks of code -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} \ No newline at end of file diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_component-animations.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_component-animations.scss deleted file mode 100644 index faf3194..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_component-animations.scss +++ /dev/null @@ -1,22 +0,0 @@ -// -// Component animations -// -------------------------------------------------- - - -.fade { - opacity: 0; - @include ctb-transition(opacity .15s linear); - &.in { - opacity: 1; - } -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - @include ctb-transition(height .35s ease); - &.in { - height: auto; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_dropdowns.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_dropdowns.scss deleted file mode 100644 index 204572e..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_dropdowns.scss +++ /dev/null @@ -1,233 +0,0 @@ -// -// Dropdown menus -// -------------------------------------------------- - - -// Use the .menu class on any
  • element within the topbar or ul.tabs and you'll get some superfancy dropdowns -.dropup, -.dropdown { - position: relative; -} -.dropdown-toggle { - // The caret makes the toggle a bit too tall in IE7 - *margin-bottom: -3px; -} -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -// Dropdown arrow/caret -// -------------------- -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid $black; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; -} - -// Place the caret -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -// The dropdown menu (ul) -// ---------------------- -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: $zindexDropdown; - display: none; // none by default, but block on "open" of the menu - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; // override default ul - list-style: none; - background-color: $dropdownBackground; - border: 1px solid #ccc; // Fallback for IE7-8 - border: 1px solid $dropdownBorder; - *border-right-width: 2px; - *border-bottom-width: 2px; - @include ctb-border-radius(6px); - @include ctb-box-shadow(0 5px 10px rgba(0,0,0,.2)); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - - // Aligns the dropdown menu to right - &.pull-right { - right: 0; - left: auto; - } - - // Dividers (basically an hr) within the dropdown - .divider { - @include ctb-nav-divider($dropdownDividerTop, $dropdownDividerBottom); - } - - // Links within the dropdown menu - li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: $baseLineHeight; - color: $dropdownLinkColor; - white-space: nowrap; - } -} - -// Hover state -// ----------- -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { - text-decoration: none; - color: $dropdownLinkColorHover; - @include ctb-gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%)); -} - -// Active state -// ------------ -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: $dropdownLinkColorActive; - text-decoration: none; - outline: 0; - @include ctb-gradient-vertical($dropdownLinkBackgroundActive, darken($dropdownLinkBackgroundActive, 5%)); -} - -// Disabled state -// -------------- -// Gray out text and ensure the hover state remains gray -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { - color: $grayLight; -} -// Nuke hover effects -.dropdown-menu .disabled > a:hover { - text-decoration: none; - background-color: transparent; - background-image: none; // Remove CSS gradient - @include ctb-gradient-reset-filter(); - cursor: default; -} - -// Open state for the dropdown -// --------------------------- -.open { - // IE7's z-index only goes to the nearest positioned ancestor, which would - // make the menu appear below buttons that appeared later on the page - *z-index: $zindexDropdown; - - & > .dropdown-menu { - display: block; - } -} - -// Right aligned dropdowns -// --------------------------- -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -// Allow for dropdowns to go bottom up (aka, dropup-menu) -// ------------------------------------------------------ -// Just add .dropup after the standard .dropdown class and you're set, bro. -// TODO: abstract this so that the navbar fixed styles are not placed here? -.dropup, -.navbar-fixed-bottom .dropdown { - // Reverse the caret - .caret { - border-top: 0; - border-bottom: 4px solid $black; - content: ""; - } - // Different positioning for bottom up menu - .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; - } -} - -// Sub menus -// --------------------------- -.dropdown-submenu { - position: relative; -} -// Default dropdowns -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - @include ctb-border-radius(0 6px 6px 6px); -} -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -// Dropups -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - @include ctb-border-radius(5px 5px 5px 0); -} - -// Caret to indicate there is a submenu -.dropdown-submenu > a:after { - display: block; - content: " "; - float: right; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; - border-width: 5px 0 5px 5px; - border-left-color: darken($dropdownBackground, 20%); - margin-top: 5px; - margin-right: -10px; -} -.dropdown-submenu:hover > a:after { - border-left-color: $dropdownLinkColorHover; -} - -// Left aligned submenus -.dropdown-submenu.pull-left { - // Undo the float - // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere. - float: none; - - // Positioning the submenu - > .dropdown-menu { - left: -100%; - margin-left: 10px; - @include ctb-border-radius(6px 0 6px 6px); - } -} - -// Tweak nav headers -// ----------------- -// Increase padding from 15px to 20px on sides -.dropdown .dropdown-menu .nav-header { - padding-left: 20px; - padding-right: 20px; -} - -// Typeahead -// --------- -.typeahead { - z-index: 1051; - margin-top: 2px; // give it some space to breathe - @include ctb-border-radius($baseBorderRadius); -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_font-awesome.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_font-awesome.scss deleted file mode 100644 index ba18d1a..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_font-awesome.scss +++ /dev/null @@ -1,535 +0,0 @@ -/*! - * Font Awesome 3.0.1 - * the iconic font designed for use with Twitter Bootstrap - * ------------------------------------------------------- - * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ - * - * License - * ------------------------------------------------------- - * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - - * http://opensource.org/licenses/mit-license.html - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ - * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - * - * Contact - * ------------------------------------------------------- - * Email: dave@davegandy.com - * Twitter: http://twitter.com/fortaweso_me - * Work: Lead Product Designer @ http://kyruus.com - */ - -@import "compass/css3/font-face"; -$fontAwesomePath: "fontawesome-webfont" !default; -$borderColor: #eee; -$iconMuted: #eee; -@mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; } - - -@include font-face( - 'FontAwesome', - font-files( - "#{$fontAwesomePath}.woff?v=3.0.1", woff, - "#{$fontAwesomePath}.ttf?v=3.0.1", truetype), - '#{$fontAwesomePath}.eot?v=3.0.1', - normal, - normal); - - -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"], -[class*=" icon-"] { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - - /* sprites.less reset */ - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} - -/* more sprites.less reset */ -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: none; -} - -[class^="icon-"]:before, -[class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; - speak: none; -} - -/* makes sure icons active on rollover in links */ -a { - [class^="icon-"], - [class*=" icon-"] { - display: inline-block; - } -} - -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; - font-size: 1.3333333333333333em; -} - -.btn, .nav { - [class^="icon-"], - [class*=" icon-"] { - display: inline; - /* keeps button heights with and without icons the same */ - &.icon-large { line-height: .9em; } - &.icon-spin { display: inline-block; } - } -} - -.nav-tabs, .nav-pills { - [class^="icon-"], - [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - &, &.icon-large { line-height: .9em; } - } -} - -li, .nav li { - [class^="icon-"], - [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; - &.icon-large { - /* increased font size for icon-large */ - width: 1.5625em; - } - } -} - -ul.icons { - list-style-type: none; - text-indent: -.75em; - - li { - [class^="icon-"], - [class*=" icon-"] { - width: .75em; - } - } -} - -.icon-muted { - color: $iconMuted; -} - -// Icon Borders -// ------------------------- - -.icon-border { - border: solid 1px $borderColor; - padding: .2em .25em .15em; - @include border-radius(3px); -} - -// Icon Sizes -// ------------------------- - -.icon-2x { - font-size: 2em; - &.icon-border { - border-width: 2px; - @include border-radius(4px); - } -} -.icon-3x { - font-size: 3em; - &.icon-border { - border-width: 3px; - @include border-radius(5px); - } -} -.icon-4x { - font-size: 4em; - &.icon-border { - border-width: 4px; - @include border-radius(6px); - } -} - -// Floats -// ------------------------- - -// Quick floats -.pull-right { float: right; } -.pull-left { float: left; } - -[class^="icon-"], -[class*=" icon-"] { - &.pull-left { - margin-right: .3em; - } - &.pull-right { - margin-left: .3em; - } -} - -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .18em; } - } - &.icon-spin.icon-large { line-height: .8em; } - } -} - -.btn.btn-small { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .25em; } - } - } -} - -.btn.btn-large { - [class^="icon-"], - [class*=" icon-"] { - margin-top: 0; // overrides bootstrap default - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .05em; } - } - &.pull-left.icon-2x { margin-right: .2em; } - &.pull-right.icon-2x { margin-left: .2em; } - } -} - - -.icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -@-moz-keyframes spin { - 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } -} -@-webkit-keyframes spin { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } -} -@-o-keyframes spin { - 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } -} -@-ms-keyframes spin { - 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } -} -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } -} - -@-moz-document url-prefix() { - .icon-spin { height: .9em; } - .btn .icon-spin { height: auto; } - .icon-spin.icon-large { height: 1.25em; } - .btn .icon-spin.icon-large { height: .75em; } -} - -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { content: "\f000"; } -.icon-music:before { content: "\f001"; } -.icon-search:before { content: "\f002"; } -.icon-envelope:before { content: "\f003"; } -.icon-heart:before { content: "\f004"; } -.icon-star:before { content: "\f005"; } -.icon-star-empty:before { content: "\f006"; } -.icon-user:before { content: "\f007"; } -.icon-film:before { content: "\f008"; } -.icon-th-large:before { content: "\f009"; } -.icon-th:before { content: "\f00a"; } -.icon-th-list:before { content: "\f00b"; } -.icon-ok:before { content: "\f00c"; } -.icon-remove:before { content: "\f00d"; } -.icon-zoom-in:before { content: "\f00e"; } - -.icon-zoom-out:before { content: "\f010"; } -.icon-off:before { content: "\f011"; } -.icon-signal:before { content: "\f012"; } -.icon-cog:before { content: "\f013"; } -.icon-trash:before { content: "\f014"; } -.icon-home:before { content: "\f015"; } -.icon-file:before { content: "\f016"; } -.icon-time:before { content: "\f017"; } -.icon-road:before { content: "\f018"; } -.icon-download-alt:before { content: "\f019"; } -.icon-download:before { content: "\f01a"; } -.icon-upload:before { content: "\f01b"; } -.icon-inbox:before { content: "\f01c"; } -.icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before { content: "\f01e"; } - -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { content: "\f021"; } -.icon-list-alt:before { content: "\f022"; } -.icon-lock:before { content: "\f023"; } -.icon-flag:before { content: "\f024"; } -.icon-headphones:before { content: "\f025"; } -.icon-volume-off:before { content: "\f026"; } -.icon-volume-down:before { content: "\f027"; } -.icon-volume-up:before { content: "\f028"; } -.icon-qrcode:before { content: "\f029"; } -.icon-barcode:before { content: "\f02a"; } -.icon-tag:before { content: "\f02b"; } -.icon-tags:before { content: "\f02c"; } -.icon-book:before { content: "\f02d"; } -.icon-bookmark:before { content: "\f02e"; } -.icon-print:before { content: "\f02f"; } - -.icon-camera:before { content: "\f030"; } -.icon-font:before { content: "\f031"; } -.icon-bold:before { content: "\f032"; } -.icon-italic:before { content: "\f033"; } -.icon-text-height:before { content: "\f034"; } -.icon-text-width:before { content: "\f035"; } -.icon-align-left:before { content: "\f036"; } -.icon-align-center:before { content: "\f037"; } -.icon-align-right:before { content: "\f038"; } -.icon-align-justify:before { content: "\f039"; } -.icon-list:before { content: "\f03a"; } -.icon-indent-left:before { content: "\f03b"; } -.icon-indent-right:before { content: "\f03c"; } -.icon-facetime-video:before { content: "\f03d"; } -.icon-picture:before { content: "\f03e"; } - -.icon-pencil:before { content: "\f040"; } -.icon-map-marker:before { content: "\f041"; } -.icon-adjust:before { content: "\f042"; } -.icon-tint:before { content: "\f043"; } -.icon-edit:before { content: "\f044"; } -.icon-share:before { content: "\f045"; } -.icon-check:before { content: "\f046"; } -.icon-move:before { content: "\f047"; } -.icon-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { content: "\f049"; } -.icon-backward:before { content: "\f04a"; } -.icon-play:before { content: "\f04b"; } -.icon-pause:before { content: "\f04c"; } -.icon-stop:before { content: "\f04d"; } -.icon-forward:before { content: "\f04e"; } - -.icon-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { content: "\f051"; } -.icon-eject:before { content: "\f052"; } -.icon-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { content: "\f055"; } -.icon-minus-sign:before { content: "\f056"; } -.icon-remove-sign:before { content: "\f057"; } -.icon-ok-sign:before { content: "\f058"; } -.icon-question-sign:before { content: "\f059"; } -.icon-info-sign:before { content: "\f05a"; } -.icon-screenshot:before { content: "\f05b"; } -.icon-remove-circle:before { content: "\f05c"; } -.icon-ok-circle:before { content: "\f05d"; } -.icon-ban-circle:before { content: "\f05e"; } - -.icon-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before { content: "\f064"; } -.icon-resize-full:before { content: "\f065"; } -.icon-resize-small:before { content: "\f066"; } -.icon-plus:before { content: "\f067"; } -.icon-minus:before { content: "\f068"; } -.icon-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { content: "\f06a"; } -.icon-gift:before { content: "\f06b"; } -.icon-leaf:before { content: "\f06c"; } -.icon-fire:before { content: "\f06d"; } -.icon-eye-open:before { content: "\f06e"; } - -.icon-eye-close:before { content: "\f070"; } -.icon-warning-sign:before { content: "\f071"; } -.icon-plane:before { content: "\f072"; } -.icon-calendar:before { content: "\f073"; } -.icon-random:before { content: "\f074"; } -.icon-comment:before { content: "\f075"; } -.icon-magnet:before { content: "\f076"; } -.icon-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { content: "\f078"; } -.icon-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { content: "\f07b"; } -.icon-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { content: "\f07d"; } -.icon-resize-horizontal:before { content: "\f07e"; } - -.icon-bar-chart:before { content: "\f080"; } -.icon-twitter-sign:before { content: "\f081"; } -.icon-facebook-sign:before { content: "\f082"; } -.icon-camera-retro:before { content: "\f083"; } -.icon-key:before { content: "\f084"; } -.icon-cogs:before { content: "\f085"; } -.icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { content: "\f087"; } -.icon-thumbs-down:before { content: "\f088"; } -.icon-star-half:before { content: "\f089"; } -.icon-heart-empty:before { content: "\f08a"; } -.icon-signout:before { content: "\f08b"; } -.icon-linkedin-sign:before { content: "\f08c"; } -.icon-pushpin:before { content: "\f08d"; } -.icon-external-link:before { content: "\f08e"; } - -.icon-signin:before { content: "\f090"; } -.icon-trophy:before { content: "\f091"; } -.icon-github-sign:before { content: "\f092"; } -.icon-upload-alt:before { content: "\f093"; } -.icon-lemon:before { content: "\f094"; } -.icon-phone:before { content: "\f095"; } -.icon-check-empty:before { content: "\f096"; } -.icon-bookmark-empty:before { content: "\f097"; } -.icon-phone-sign:before { content: "\f098"; } -.icon-twitter:before { content: "\f099"; } -.icon-facebook:before { content: "\f09a"; } -.icon-github:before { content: "\f09b"; } -.icon-unlock:before { content: "\f09c"; } -.icon-credit-card:before { content: "\f09d"; } -.icon-rss:before { content: "\f09e"; } - -.icon-hdd:before { content: "\f0a0"; } -.icon-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { content: "\f0a2"; } -.icon-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { content: "\f0a4"; } -.icon-hand-left:before { content: "\f0a5"; } -.icon-hand-up:before { content: "\f0a6"; } -.icon-hand-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { content: "\f0ab"; } -.icon-globe:before { content: "\f0ac"; } -.icon-wrench:before { content: "\f0ad"; } -.icon-tasks:before { content: "\f0ae"; } - -.icon-filter:before { content: "\f0b0"; } -.icon-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { content: "\f0b2"; } - -.icon-group:before { content: "\f0c0"; } -.icon-link:before { content: "\f0c1"; } -.icon-cloud:before { content: "\f0c2"; } -.icon-beaker:before { content: "\f0c3"; } -.icon-cut:before { content: "\f0c4"; } -.icon-copy:before { content: "\f0c5"; } -.icon-paper-clip:before { content: "\f0c6"; } -.icon-save:before { content: "\f0c7"; } -.icon-sign-blank:before { content: "\f0c8"; } -.icon-reorder:before { content: "\f0c9"; } -.icon-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { content: "\f0cd"; } -.icon-table:before { content: "\f0ce"; } - -.icon-magic:before { content: "\f0d0"; } -.icon-truck:before { content: "\f0d1"; } -.icon-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { content: "\f0d3"; } -.icon-google-plus-sign:before { content: "\f0d4"; } -.icon-google-plus:before { content: "\f0d5"; } -.icon-money:before { content: "\f0d6"; } -.icon-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { content: "\f0da"; } -.icon-columns:before { content: "\f0db"; } -.icon-sort:before { content: "\f0dc"; } -.icon-sort-down:before { content: "\f0dd"; } -.icon-sort-up:before { content: "\f0de"; } - -.icon-envelope-alt:before { content: "\f0e0"; } -.icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before { content: "\f0e2"; } -.icon-legal:before { content: "\f0e3"; } -.icon-dashboard:before { content: "\f0e4"; } -.icon-comment-alt:before { content: "\f0e5"; } -.icon-comments-alt:before { content: "\f0e6"; } -.icon-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { content: "\f0e9"; } -.icon-paste:before { content: "\f0ea"; } -.icon-lightbulb:before { content: "\f0eb"; } -.icon-exchange:before { content: "\f0ec"; } -.icon-cloud-download:before { content: "\f0ed"; } -.icon-cloud-upload:before { content: "\f0ee"; } - -.icon-user-md:before { content: "\f0f0"; } -.icon-stethoscope:before { content: "\f0f1"; } -.icon-suitcase:before { content: "\f0f2"; } -.icon-bell-alt:before { content: "\f0f3"; } -.icon-coffee:before { content: "\f0f4"; } -.icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { content: "\f0f6"; } -.icon-building:before { content: "\f0f7"; } -.icon-hospital:before { content: "\f0f8"; } -.icon-ambulance:before { content: "\f0f9"; } -.icon-medkit:before { content: "\f0fa"; } -.icon-fighter-jet:before { content: "\f0fb"; } -.icon-beer:before { content: "\f0fc"; } -.icon-h-sign:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { content: "\f0fe"; } - -.icon-double-angle-left:before { content: "\f100"; } -.icon-double-angle-right:before { content: "\f101"; } -.icon-double-angle-up:before { content: "\f102"; } -.icon-double-angle-down:before { content: "\f103"; } -.icon-angle-left:before { content: "\f104"; } -.icon-angle-right:before { content: "\f105"; } -.icon-angle-up:before { content: "\f106"; } -.icon-angle-down:before { content: "\f107"; } -.icon-desktop:before { content: "\f108"; } -.icon-laptop:before { content: "\f109"; } -.icon-tablet:before { content: "\f10a"; } -.icon-mobile-phone:before { content: "\f10b"; } -.icon-circle-blank:before { content: "\f10c"; } -.icon-quote-left:before { content: "\f10d"; } -.icon-quote-right:before { content: "\f10e"; } - -.icon-spinner:before { content: "\f110"; } -.icon-circle:before { content: "\f111"; } -.icon-reply:before { content: "\f112"; } -.icon-github-alt:before { content: "\f113"; } -.icon-folder-close-alt:before { content: "\f114"; } -.icon-folder-open-alt:before { content: "\f115"; } diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_forms.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_forms.scss deleted file mode 100644 index d955a5d..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_forms.scss +++ /dev/null @@ -1,687 +0,0 @@ -// -// Forms -// -------------------------------------------------- - - -// GENERAL STYLES -// -------------- - -// Make all forms have space below them -form { - margin: 0 0 $baseLineHeight; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -// Groups of fields with labels on top (legends) -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: $baseLineHeight; - font-size: $baseFontSize * 1.5; - line-height: $baseLineHeight * 2; - color: $grayDark; - border: 0; - border-bottom: 1px solid #e5e5e5; - - // Small - small { - font-size: $baseLineHeight * .75; - color: $grayLight; - } -} - -// Set font for forms -label, -input, -button, -select, -textarea { - @include ctb-font-shorthand($baseFontSize,normal,$baseLineHeight); // Set size, weight, line-height here -} -input, -button, -select, -textarea { - font-family: $baseFontFamily; // And only set font-family here for those that need it (note the missing label element) -} - -// Identify controls by their labels -label { - display: block; - margin-bottom: 5px; -} - -// Form controls -// ------------------------- - -// Shared size and type resets -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - display: inline-block; - height: $baseLineHeight; - padding: 4px 6px; - margin-bottom: $baseLineHeight / 2; - font-size: $baseFontSize; - line-height: $baseLineHeight; - color: $gray; - @include ctb-border-radius($inputBorderRadius); - vertical-align: middle; -} - -// Reset appearance properties for textual inputs and textarea -// Declare width for legacy (can't be on input[type=*] selectors or it's too specific) -input, -textarea, -.uneditable-input { - width: 206px; // plus 12px padding and 2px border -} -// Reset height since textareas have rows -textarea { - height: auto; -} -// Everything else -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: $inputBackground; - border: 1px solid $inputBorder; - @include ctb-box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); - @include ctb-transition(#{border linear .2s, box-shadow linear .2s}); - - // Focus state - &:focus { - border-color: rgba(82,168,236,.8); - outline: 0; - outline: thin dotted \9; /* IE6-9 */ - @include ctb-box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)}); - } -} - -// Position radios and checkboxes better -input[type="radio"], -input[type="checkbox"] { - margin: 4px 0 0; - *margin-top: 0; /* IE7 */ - margin-top: 1px \9; /* IE8-9 */ - line-height: normal; -} - -// Reset width of input images, buttons, radios, checkboxes -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; // Override of generic input selector -} - -// Set the height of select and file controls to match text inputs -select, -input[type="file"] { - height: $inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: $inputHeight; -} - -// Make select elements obey height by applying a border -select { - width: 220px; // default input width + 10px of padding that doesn't get applied - border: 1px solid $inputBorder; - background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color -} - -// Make multiple select elements height not fixed -select[multiple], -select[size] { - height: auto; -} - -// Focus for select, file, radio, and checkbox -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - @include ctb-tab-focus(); -} - - -// Uneditable inputs -// ------------------------- - -// Make uneditable inputs look inactive -.uneditable-input, -.uneditable-textarea { - color: $grayLight; - background-color: darken($inputBackground, 1%); - border-color: $inputBorder; - @include ctb-box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); - cursor: not-allowed; -} - -// For text that needs to appear as an input but should not be an input -.uneditable-input { - overflow: hidden; // prevent text from wrapping, but still cut it off like an input does - white-space: nowrap; -} - -// Make uneditable textareas behave like a textarea -.uneditable-textarea { - width: auto; - height: auto; -} - - -// Placeholder -// ------------------------- - -// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector -input, -textarea { - @include ctb-placeholder(); -} - - -// CHECKBOXES & RADIOS -// ------------------- - -// Indent the labels to position radios/checkboxes as hanging -.radio, -.checkbox { - min-height: $baseLineHeight; // clear the floating input if there is no label text - padding-left: 20px; -} -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -20px; -} - -// Move the options list down to align with labels -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; // has to be padding because margin collaspes -} - -// Radios and checkboxes on same line -// TODO v3: Convert .inline to .control-inline -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; // space out consecutive inline controls -} - - - -// INPUT SIZES -// ----------- - -// General classes for quick sizes -.input-mini { width: 60px; } -.input-small { width: 90px; } -.input-medium { width: 150px; } -.input-large { width: 210px; } -.input-xlarge { width: 270px; } -.input-xxlarge { width: 530px; } - -// Grid style input sizes -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -// Redeclare since the fluid row class is more specific -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} -// Ensure input-prepend/append never wraps -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - - - -// GRID SIZING FOR INPUTS -// ---------------------- - -// Grid sizes -@include ctb-grid-input($gridColumnWidth, $gridGutterWidth); - -// Control row for multiple inputs per line -.controls-row { - @include ctb-clearfix(); // Clear the float from controls -} - -// Float to collapse white-space for proper grid alignment -.controls-row [class*="span"], -// Redeclare the fluid grid collapse since we undo the float for inputs -.row-fluid .controls-row [class*="span"] { - float: left; -} -// Explicity set top padding on all checkboxes/radios, not just first-child -.controls-row .checkbox[class*="span"], -.controls-row .radio[class*="span"] { - padding-top: 5px; -} - - - - -// DISABLED STATE -// -------------- - -// Disabled and read-only inputs -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: $inputDisabledBackground; -} -// Explicitly reset the colors here -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - - - - -// FORM FIELD FEEDBACK STATES -// -------------------------- - -// Warning -.control-group.warning { - @include ctb-formFieldState($warningText, $warningText, $warningBackground); -} -// Error -.control-group.error { - @include ctb-formFieldState($errorText, $errorText, $errorBackground); -} -// Success -.control-group.success { - @include ctb-formFieldState($successText, $successText, $successBackground); -} -// Success -.control-group.info { - @include ctb-formFieldState($infoText, $infoText, $infoBackground); -} - -// HTML5 invalid states -// Shares styles with the .control-group.error above -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; - &:focus { - border-color: darken(#ee5f5b, 10%); - $shadow: 0 0 6px lighten(#ee5f5b, 20%); - @include ctb-box-shadow($shadow); - } -} - - - -// FORM ACTIONS -// ------------ - -.form-actions { - padding: ($baseLineHeight - 1) 20px $baseLineHeight; - margin-top: $baseLineHeight; - margin-bottom: $baseLineHeight; - background-color: $formActionsBackground; - border-top: 1px solid #e5e5e5; - @include ctb-clearfix(); // Adding clearfix to allow for .pull-right button containers -} - - - -// HELP TEXT -// --------- - -.help-block, -.help-inline { - color: lighten($textColor, 15%); // lighten the text some for contrast -} - -.help-block { - display: block; // account for any element using help-block - margin-bottom: $baseLineHeight / 2; -} - -.help-inline { - display: inline-block; - @include ctb-ie7-inline-block(); - vertical-align: middle; - padding-left: 5px; -} - - - -// INPUT GROUPS -// ------------ - -// Allow us to put symbols and text within the input field for a cleaner look -.input-append, -.input-prepend { - margin-bottom: 5px; - font-size: 0; // white space collapse hack - white-space: nowrap; // Prevent span and input from separating - - // Reset the white space collapse hack - input, - select, - .uneditable-input, - .dropdown-menu { - font-size: $baseFontSize; - } - - input, - select, - .uneditable-input { - position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness - margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms - *margin-left: 0; - vertical-align: top; - @include ctb-border-radius(0 $inputBorderRadius $inputBorderRadius 0); - // Make input on top when focused so blue border and shadow always show - &:focus { - z-index: 2; - } - } - .add-on { - display: inline-block; - width: auto; - height: $baseLineHeight; - min-width: 16px; - padding: 4px 5px; - font-size: $baseFontSize; - font-weight: normal; - line-height: $baseLineHeight; - text-align: center; - text-shadow: 0 1px 0 $white; - background-color: $grayLighter; - border: 1px solid #ccc; - } - .add-on, - .btn, - .btn-group > .dropdown-toggle { - vertical-align: top; - @include ctb-border-radius(0); - } - .active { - background-color: lighten($green, 30); - border-color: $green; - } -} - -.input-prepend { - .add-on, - .btn { - margin-right: -1px; - } - .add-on:first-child, - .btn:first-child { - // FYI, `.btn:first-child` accounts for a button group that's prepended - @include ctb-border-radius($inputBorderRadius 0 0 $inputBorderRadius); - } -} - -.input-append { - input, - select, - .uneditable-input { - @include ctb-border-radius($inputBorderRadius 0 0 $inputBorderRadius); - + .btn-group .btn:last-child { - @include ctb-border-radius(0 $inputBorderRadius $inputBorderRadius 0); - } - } - .add-on, - .btn, - .btn-group { - margin-left: -1px; - } - .add-on:last-child, - .btn:last-child, - .btn-group:last-child > .dropdown-toggle { - @include ctb-border-radius(0 $inputBorderRadius $inputBorderRadius 0); - } -} - -// Remove all border-radius for inputs with both prepend and append -.input-prepend.input-append { - input, - select, - .uneditable-input { - @include ctb-border-radius(0); - + .btn-group .btn { - @include ctb-border-radius(0 $inputBorderRadius $inputBorderRadius 0); - } - } - .add-on:first-child, - .btn:first-child { - margin-right: -1px; - @include ctb-border-radius($inputBorderRadius 0 0 $inputBorderRadius); - } - .add-on:last-child, - .btn:last-child { - margin-left: -1px; - @include ctb-border-radius(0 $inputBorderRadius $inputBorderRadius 0); - } - .btn-group:first-child { - margin-left: 0; - } -} - - - - -// SEARCH FORM -// ----------- - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; // Remove the default margin on all inputs - @include ctb-border-radius(15px); -} - -/* Allow for input prepend/append in search forms */ -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - @include ctb-border-radius(0); // Override due to specificity -} -.form-search .input-append .search-query { - @include ctb-border-radius(14px 0 0 14px); -} -.form-search .input-append .btn { - @include ctb-border-radius(0 14px 14px 0); -} -.form-search .input-prepend .search-query { - @include ctb-border-radius(0 14px 14px 0); -} -.form-search .input-prepend .btn { - @include ctb-border-radius(14px 0 0 14px); -} - - - - -// HORIZONTAL & VERTICAL FORMS -// --------------------------- - -// Common properties -// ----------------- - -.form-search, -.form-inline, -.form-horizontal { - input, - textarea, - select, - .help-inline, - .uneditable-input, - .input-prepend, - .input-append { - display: inline-block; - @include ctb-ie7-inline-block(); - margin-bottom: 0; - vertical-align: middle; - } - // Re-hide hidden elements due to specifity - .hide { - display: none; - } -} -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; -} -// Remove margin for input-prepend/-append -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} -// Inline checkbox/radio labels (remove padding on left) -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} -// Remove float and margin, set to inline-block -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - - -// Margin to space out fieldsets -.control-group { - margin-bottom: $baseLineHeight / 2; -} - -// Legend collapses margin, so next element is responsible for spacing -legend + .control-group { - margin-top: $baseLineHeight; - -webkit-margin-top-collapse: separate; -} - -// Horizontal-specific styles -// -------------------------- - -.form-horizontal { - // Increase spacing between groups - .control-group { - margin-bottom: $baseLineHeight; - @include ctb-clearfix(); - } - // Float the labels left - .control-label { - float: left; - width: $horizontalComponentOffset - 20; - padding-top: 5px; - text-align: right; - } - // Move over all input controls and content - .controls { - // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend - // don't inherit the margin of the parent, in this case .controls - *display: inline-block; - *padding-left: 20px; - margin-left: $horizontalComponentOffset; - *margin-left: 0; - &:first-child { - *padding-left: $horizontalComponentOffset; - } - } - // Remove bottom margin on block level help text since that's accounted for on .control-group - .help-block { - margin-bottom: 0; - } - // And apply it only to .help-block instances that follow a form control - input, - select, - textarea, - .uneditable-input, - .input-prepend, - .input-append { - + .help-block { - margin-top: $baseLineHeight / 2; - } - } - // Move over buttons in .form-actions to align with .controls - .form-actions { - padding-left: $horizontalComponentOffset; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_grid.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_grid.scss deleted file mode 100644 index 7e4ab63..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_grid.scss +++ /dev/null @@ -1,21 +0,0 @@ -// -// Grid system -// -------------------------------------------------- - - -// Fixed (940px) -@include ctb-grid-core($gridColumnWidth, $gridGutterWidth); - -// Fluid (940px) -@include ctb-grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth); - -// Reset utility classes due to specificity -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_hero-unit.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_hero-unit.scss deleted file mode 100644 index c872457..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_hero-unit.scss +++ /dev/null @@ -1,25 +0,0 @@ -// -// Hero unit -// -------------------------------------------------- - - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - font-size: 18px; - font-weight: 200; - line-height: $baseLineHeight * 1.5; - color: $heroUnitLeadColor; - background-color: $heroUnitBackground; - @include ctb-border-radius(6px); - h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - color: $heroUnitHeadingColor; - letter-spacing: -1px; - } - li { - line-height: $baseLineHeight * 1.5; // Reset since we specify in type.less - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_labels-badges.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_labels-badges.scss deleted file mode 100644 index 149cec0..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_labels-badges.scss +++ /dev/null @@ -1,79 +0,0 @@ -// -// Labels and badges -// -------------------------------------------------- - - -// Base classes -.label, -.badge { - display: inline-block; - padding: 2px 4px; - font-size: $baseFontSize * .846; - font-weight: bold; - line-height: 14px; // ensure proper line-height if floated - color: $white; - vertical-align: baseline; - white-space: nowrap; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - background-color: $grayLight; -} -// Set unique padding and border-radii -.label { - @include ctb-border-radius(3px); -} -.badge { - padding-left: 9px; - padding-right: 9px; - @include ctb-border-radius(9px); -} - -// Empty labels/badges collapse -.label, -.badge { - &:empty { - display: none; - } -} - -// Hover state, but only for links -a { - &.label:hover, - &.badge:hover { - color: $white; - text-decoration: none; - cursor: pointer; - } -} - -// Colors -// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute) -// Important (red) -.label-important, .badge-important { background-color: $errorText; } -.label-important[href], .badge-important[href] { background-color: darken($errorText, 10%); } -// Warnings (orange) -.label-warning, .badge-warning { background-color: $orange; } -.label-warning[href], .badge-warning[href] { background-color: darken($orange, 10%); } -// Success (green) -.label-success, .badge-success { background-color: $successText; } -.label-success[href], .badge-success[href] { background-color: darken($successText, 10%); } -// Info (turquoise) -.label-info, .badge-info { background-color: $infoText; } -.label-info[href], .badge-info[href] { background-color: darken($infoText, 10%); } -// Inverse (black) -.label-inverse, .badge-inverse { background-color: $grayDark; } -.label-inverse[href], .badge-inverse[href] { background-color: darken($grayDark, 10%); } - -// Quick fix for labels/badges in buttons -.btn { - .label, - .badge { - position: relative; - top: -1px; - } -} -.btn-mini { - .label, - .badge { - top: 0; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_layouts.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_layouts.scss deleted file mode 100644 index f2218c1..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_layouts.scss +++ /dev/null @@ -1,16 +0,0 @@ -// -// Layouts -// -------------------------------------------------- - - -// Container (centered, fixed-width layouts) -.container { - @include ctb-container-fixed(); -} - -// Fluid layouts (left aligned, with sidebar, min- & max-width content) -.container-fluid { - padding-right: $gridGutterWidth; - padding-left: $gridGutterWidth; - @include ctb-clearfix(); -} \ No newline at end of file diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_media.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_media.scss deleted file mode 100644 index 1decab7..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_media.scss +++ /dev/null @@ -1,55 +0,0 @@ -// Media objects -// Source: http://stubbornella.org/content/?p=497 -// -------------------------------------------------- - - -// Common styles -// ------------------------- - -// Clear the floats -.media, -.media-body { - overflow: hidden; - *overflow: visible; - zoom: 1; -} - -// Proper spacing between instances of .media -.media, -.media .media { - margin-top: 15px; -} -.media:first-child { - margin-top: 0; -} - -// For images and videos, set to block -.media-object { - display: block; -} - -// Reset margins on headings for tighter default spacing -.media-heading { - margin: 0 0 5px; -} - - -// Media image alignment -// ------------------------- - -.media .pull-left { - margin-right: 10px; -} -.media .pull-right { - margin-left: 10px; -} - - -// Media list variation -// ------------------------- - -// Undo default ul/ol styles -.media-list { - margin-left: 0; - list-style: none; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_mixins.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_mixins.scss deleted file mode 100644 index 65858c2..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_mixins.scss +++ /dev/null @@ -1,656 +0,0 @@ -// -// Mixins -// -------------------------------------------------- - - -// UTILITY MIXINS -// -------------------------------------------------- - -// Clearfix -// -------- -// For clearing floats like a boss h5bp.com/q -@mixin ctb-clearfix { - *zoom: 1; - &:before, - &:after { - display: table; - content: ""; - // Fixes Opera/contenteditable bug: - // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952 - line-height: 0; - } - &:after { - clear: both; - } -} - -// Webkit-style focus -// ------------------ -@mixin ctb-tab-focus() { - // Default - outline: thin dotted #333; - // Webkit - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -// Center-align a block level element -// ---------------------------------- -@mixin ctb-center-block() { - display: block; - margin-left: auto; - margin-right: auto; -} - -// IE7 inline-block -// ---------------- -@mixin ctb-ie7-inline-block() { - *display: inline; // IE7 inline-block hack - *zoom: 1; -} - -// IE7 likes to collapse whitespace on either side of the inline-block elements. -// Ems because we're attempting to match the width of a space character. Left -// version is for form buttons, which typically come after other elements, and -// right version is for icons, which come before. Applying both is ok, but it will -// mean that space between those elements will be .6em (~2 space characters) in IE7, -// instead of the 1 space in other browsers. -@mixin ctb-ie7-restore-left-whitespace() { - *margin-left: .3em; - - &:first-child { - *margin-left: 0; - } -} - -@mixin ctb-ie7-restore-right-whitespace() { - *margin-right: .3em; -} - -// Sizing shortcuts -// ------------------------- -@mixin ctb-size($height, $width) { - width: $width; - height: $height; -} -@mixin ctb-square($size) { - @include ctb-size($size, $size); -} - -// Placeholder text -// ------------------------- -@mixin ctb-placeholder($color: $placeholderText) { - &:-moz-placeholder { - color: $color; - } - &:-ms-input-placeholder { - color: $color; - } - &::-webkit-input-placeholder { - color: $color; - } -} - -// Text overflow -// ------------------------- -// Requires inline-block or block for proper styling -@mixin ctb-text-overflow() { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -// CSS image replacement -// ------------------------- -// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 -@mixin ctb-hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -// FONTS -// -------------------------------------------------- - -@mixin ctb-font-family-serif() { - font-family: $serifFontFamily; -} -@mixin ctb-font-family-sans-serif() { - font-family: $sansFontFamily; -} -@mixin ctb-font-family-monospace() { - font-family: $monoFontFamily; -} -@mixin ctb-font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) { - font-size: $size; - font-weight: $weight; - line-height: $lineHeight; -} -@mixin ctb-font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) { - @include ctb-font-family-serif(); - @include ctb-font-shorthand($size, $weight, $lineHeight); -} -@mixin ctb-font-sans-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) { - @include ctb-font-family-sans-serif(); - @include ctb-font-shorthand($size, $weight, $lineHeight); -} -@mixin ctb-font-monospace($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) { - @include ctb-font-family-monospace(); - @include ctb-font-shorthand($size, $weight, $lineHeight); -} - - -// FORMS -// -------------------------------------------------- - -// Block level inputs -@mixin ctb-input-block-level { - display: block; - width: 100%; - min-height: 30px; // Make inputs at least the height of their button counterpart - @include ctb-box-sizing(border-box); // Makes inputs behave like true block-level elements -} - - - -// Mixin for form field states -@mixin ctb-formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) { - // Set the text color - > label, - .help-block, - .help-inline { - color: $textColor; - } - // Style inputs accordingly - .checkbox, - .radio, - input, - select, - textarea { - color: $textColor; - border-color: $borderColor; - @include ctb-box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work - &:focus { - border-color: darken($borderColor, 10%); - // Write out in full since the lighten() function isn't easily escaped - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%); - } - } - // Give a small background color for input-prepend/-append - .input-prepend .add-on, - .input-append .add-on { - color: $textColor; - background-color: $backgroundColor; - border-color: $textColor; - } -} - - - -// CSS3 PROPERTIES -// -------------------------------------------------- - -// Border Radius -@mixin ctb-border-radius($radius) { - -webkit-border-radius: $radius; - -moz-border-radius: $radius; - border-radius: $radius; -} - -// Single Corner Border Radius -@mixin ctb-border-top-left-radius($radius) { - -webkit-border-top-left-radius: $radius; - -moz-border-radius-topleft: $radius; - border-top-left-radius: $radius; -} -@mixin ctb-border-top-right-radius($radius) { - -webkit-border-top-right-radius: $radius; - -moz-border-radius-topright: $radius; - border-top-right-radius: $radius; -} -@mixin ctb-border-bottom-right-radius($radius) { - -webkit-border-bottom-right-radius: $radius; - -moz-border-radius-bottomright: $radius; - border-bottom-right-radius: $radius; -} -@mixin ctb-border-bottom-left-radius($radius) { - -webkit-border-bottom-left-radius: $radius; - -moz-border-radius-bottomleft: $radius; - border-bottom-left-radius: $radius; -} - -// Single Side Border Radius -@mixin ctb-border-top-radius($radius) { - @include ctb-border-top-right-radius($radius); - @include ctb-border-top-left-radius($radius); -} -@mixin ctb-border-right-radius($radius) { - @include ctb-border-top-right-radius($radius); - @include ctb-border-bottom-right-radius($radius); -} -@mixin ctb-border-bottom-radius($radius) { - @include ctb-border-bottom-right-radius($radius); - @include ctb-border-bottom-left-radius($radius); -} -@mixin ctb-border-left-radius($radius) { - @include ctb-border-top-left-radius($radius); - @include ctb-border-bottom-left-radius($radius); -} - -// Drop shadows -@mixin ctb-box-shadow($shadow) { - -webkit-box-shadow: $shadow; - -moz-box-shadow: $shadow; - box-shadow: $shadow; -} - -// Transitions -@mixin ctb-transition($transition) { - -webkit-transition: $transition; - -moz-transition: $transition; - -o-transition: $transition; - transition: $transition; -} - -// Transformations -@mixin ctb-rotate($degrees) { - -webkit-transform: rotate($degrees); - -moz-transform: rotate($degrees); - -ms-transform: rotate($degrees); - -o-transform: rotate($degrees); - transform: rotate($degrees); -} -@mixin ctb-scale($ratio) { - -webkit-transform: scale($ratio); - -moz-transform: scale($ratio); - -ms-transform: scale($ratio); - -o-transform: scale($ratio); - transform: scale($ratio); -} -@mixin ctb-translate($x, $y) { - -webkit-transform: translate($x, $y); - -moz-transform: translate($x, $y); - -ms-transform: translate($x, $y); - -o-transform: translate($x, $y); - transform: translate($x, $y); -} - -@mixin ctb-skew($x, $y) { - -webkit-transform: skew($x, $y); - -moz-transform: skew($x, $y); - -ms-transform: skew($x, $y); - -o-transform: skew($x, $y); - transform: skew($x, $y); -} - -@mixin ctb-translate3d($x, $y, $z) { - -webkit-transform: translate3d($x, $y, $z); - -moz-transform: translate3d($x, $y, $z); - -o-transform: translate3d($x, $y, $z); - transform: translate3d($x, $y, $z); -} - -// Backface visibility -// Prevent browsers from flickering when using CSS 3D transforms. -// Default value is `visible`, but can be changed to `hidden -// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples -@mixin ctb-backface-visibility($visibility){ - -webkit-backface-visibility: $visibility; - -moz-backface-visibility: $visibility; - backface-visibility: $visibility; -} - -// Background clipping -// Heads up: FF 3.6 and under need "padding" instead of "padding-box" -@mixin ctb-background-clip($clip) { - -webkit-background-clip: $clip; - -moz-background-clip: $clip; - background-clip: $clip; -} - -// Background sizing -@mixin ctb-background-size($size) { - -webkit-background-size: $size; - -moz-background-size: $size; - -o-background-size: $size; - background-size: $size; -} - - -// Box sizing -@mixin ctb-box-sizing($boxmodel) { - -webkit-box-sizing: $boxmodel; - -moz-box-sizing: $boxmodel; - box-sizing: $boxmodel; -} - -// User select -// For selecting text on the page -@mixin ctb-user-select($select) { - -webkit-user-select: $select; - -moz-user-select: $select; - -ms-user-select: $select; - -o-user-select: $select; - user-select: $select; -} - -// Resize anything -@mixin ctb-resizable($direction) { - resize: $direction; // Options: horizontal, vertical, both - overflow: auto; // Safari fix -} - -// CSS3 Content Columns -@mixin ctb-content-columns($columnCount, $columnGap: $gridGutterWidth) { - -webkit-column-count: $columnCount; - -moz-column-count: $columnCount; - column-count: $columnCount; - -webkit-column-gap: $columnGap; - -moz-column-gap: $columnGap; - column-gap: $columnGap; -} - -// Optional hyphenation -@mixin ctb-hyphens($mode: auto) { - word-wrap: break-word; - -webkit-hyphens: $mode; - -moz-hyphens: $mode; - -ms-hyphens: $mode; - -o-hyphens: $mode; - hyphens: $mode; -} - -// Opacity -@mixin ctb-opacity($opacity) { - opacity: $opacity / 100; - filter: alpha(opacity=($opacity)); -} - - - -// BACKGROUNDS -// -------------------------------------------------- - -// Add an alphatransparency value to any background or border color (via Elyse Holladay) -@mixin ctb-translucent-background($color: $white, $alpha: 1) { - background-color: hsla(hue($color), saturation($color), lightness($color), $alpha); -} - -@mixin ctb-translucent-border($color: $white, $alpha: 1) { - border-color: hsla(hue($color), saturation($color), lightness($color), $alpha); - @include ctb-background-clip(padding-box); -} - -// Gradient Bar Colors for buttons and alerts -@mixin ctb-gradientBar($primaryColor, $secondaryColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) { - color: $textColor; - text-shadow: $textShadow; - @include ctb-gradient-vertical($primaryColor, $secondaryColor); - border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fade-in(rgba(0,0,0,.1), 0.15); -} - -// Gradients -@mixin ctb-gradient-horizontal($startColor: #555, $endColor: #333) { - background-color: $endColor; - background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+ - background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10 - background-image: linear-gradient(to right, $startColor, $endColor); // Standard, IE10 - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=1); // IE9 and down -} -@mixin ctb-gradient-vertical($startColor: #555, $endColor: #333) { - background-color: mix($startColor, $endColor, 62.5%); - background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+ - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(top, $startColor, $endColor); // Opera 11.10 - background-image: linear-gradient(to bottom, $startColor, $endColor); // Standard, IE10 - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=0); // IE9 and down -} -@mixin ctb-gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg) { - background-color: $endColor; - background-repeat: repeat-x; - background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+ - background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10 - background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10 -} -@mixin ctb-gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) { - background-color: mix($midColor, $endColor, 80%); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor)); - background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor); - background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop*100%, $endColor); - background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor); - background-image: linear-gradient($startColor, $midColor $colorStop, $endColor); - background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback -} -@mixin ctb-gradient-radial($innerColor: #555, $outerColor: #333) { - background-color: $outerColor; - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor)); - background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor); - background-image: -moz-radial-gradient(circle, $innerColor, $outerColor); - background-image: -o-radial-gradient(circle, $innerColor, $outerColor); - background-repeat: no-repeat; -} -@mixin ctb-gradient-striped($color, $angle: 45deg) { - background-color: $color; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); -} - -// Reset filters for IE -@mixin ctb-gradient-reset-filter() { - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - - - -// COMPONENT MIXINS -// -------------------------------------------------- - -// Horizontal dividers -// ------------------------- -// Dividers (basically an hr) within dropdowns and nav lists -@mixin ctb-nav-divider($top: #e5e5e5, $bottom: $white) { - // IE7 needs a set width since we gave a height. Restricting just - // to IE7 to keep the 1px left/right space in other browsers. - // It is unclear where IE is getting the extra space that we need - // to negative-margin away, but so it goes. - *width: 100%; - height: 1px; - margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px - *margin: -5px 0 5px; - overflow: hidden; - background-color: $top; - border-bottom: 1px solid $bottom; -} - -// Button backgrounds -// ------------------ -@mixin ctb-buttonBackground($startColor, $endColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) { - // gradientBar will set the background to a pleasing blend of these, to support IE<=9 - @include ctb-gradientBar($startColor, $endColor, $textColor, $textShadow); - *background-color: $endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - @include ctb-gradient-reset-filter(); - - // in these cases the gradient won't cover the background, so we override - &:hover, &:active, &.active, &.disabled, &[disabled] { - color: $textColor; - background-color: $endColor; - *background-color: darken($endColor, 5%); - } - - // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves - &:active, - &.active { - background-color: darken($endColor, 10%) \9; - } -} - -// Navbar vertical align -// ------------------------- -// Vertically center elements in the navbar. -// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin. -@mixin ctb-navbarVerticalAlign($elementHeight) { - margin-top: ($navbarHeight - $elementHeight) / 2; -} - - - - -// Grid System -// ----------- - -// Centered container element -@mixin ctb-container-fixed() { - margin-right: auto; - margin-left: auto; - @include ctb-clearfix(); -} - -// Table columns -@mixin ctb-tableColumns($columnSpan: 1) { - float: none; // undo default grid column styles - width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells - margin-left: 0; // undo default grid column styles -} - -// Make a Grid -// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior -@mixin ctb-makeRow() { - margin-left: $gridGutterWidth * -1; - @include ctb-clearfix(); -} -@mixin ctb-makeColumn($columns: 1, $offset: 0) { - float: left; - margin-left: ($gridColumnWidth * $offset) + ($gridGutterWidth * ($offset - 1)) + ($gridGutterWidth * 2); - width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1)); -} - -// The Grid -@mixin ctb-core-offset($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) { - margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns + 1)); -} - -@mixin ctb-core-span($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) { - width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)); -} - -@mixin ctb-grid-core($columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) { - .row { - margin-left: $gutterWidth * -1; - @include ctb-clearfix(); - } - - [class*="span"] { - float: left; - margin-left: $gutterWidth; - } - - // Set the container width, and override it for fixed navbars in media queries - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - @include ctb-core-span($gridColumns, $columnWidth, $gutterWidth); - } - - // generate .spanX and .offsetX - $i: $gridColumns; - @while $i > 0 { - .span#{$i} { @include ctb-core-span($i, $columnWidth, $gutterWidth); } - $i: $i - 1; - } - - $i: $gridColumns; - @while $i > 0 { - .offset#{$i} { @include ctb-core-offset($i, $columnWidth, $gutterWidth); } - $i: $i - 1; - } -} - -@mixin ctb-fluid-offset($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) { - margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) + ($gutterWidth * 2); - *margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%) + ($gutterWidth * 2) - (.5 / $gridRowWidth * 100px * 1%); -} - -@mixin ctb-fluid-offset-first-child($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) { - margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) + $gutterWidth; - *margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%) + $gutterWidth - (.5 / $gridRowWidth * 100px * 1%); -} - -@mixin ctb-fluid-span($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) { - width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)); - *width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%); -} - -@mixin ctb-grid-fluid($columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) { - .row-fluid { - width: 100%; - @include ctb-clearfix(); - [class*="span"] { - @include ctb-input-block-level(); - float: left; - margin-left: $gutterWidth; - *margin-left: $gutterWidth - (.5 / $gridRowWidth * 100px * 1%); - } - [class*="span"]:first-child { - margin-left: 0; - } - - // generate .spanX and .offsetX - $i: $gridColumns; - @while $i > 0 { - .span#{$i} { - @include ctb-fluid-span($i, $columnWidth, $gutterWidth); - } - .offset#{$i} { - @include ctb-fluid-offset($i, $columnWidth, $gutterWidth); - } - .offset#{$i}:first-child { - @include ctb-fluid-offset-first-child($i, $columnWidth, $gutterWidth); - } - $i: $i - 1; - } - } -} - -@mixin ctb-input-span($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) { - width: (($columnWidth) * $columns) + ($gutterWidth * ($columns - 1)) - 14; -} - -@mixin ctb-grid-input($columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) { - input, - textarea, - .uneditable-input { - margin-left: 0; // override margin-left from core grid system - } - - // Space grid-sized controls properly if multiple per line - .controls-row [class*="span"] + [class*="span"] { - margin-left: $gutterWidth; - } - - // generate .spanX - $i: $gridColumns; - @while $i > 0 { - input.span#{$i}, - textarea.span#{$i}, - .uneditable-input.span#{$i} { - @include ctb-input-span($i, $columnWidth, $gutterWidth); - } - $i: $i - 1; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_modals.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_modals.scss deleted file mode 100644 index f05bd9d..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_modals.scss +++ /dev/null @@ -1,95 +0,0 @@ -// -// Modals -// -------------------------------------------------- - -// Background -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: $zindexModalBackdrop; - background-color: $black; - // Fade for backdrop - &.fade { opacity: 0; } -} - -.modal-backdrop, -.modal-backdrop.fade.in { - @include ctb-opacity(80); -} - -// Base modal -.modal { - position: fixed; - top: 10%; - left: 50%; - z-index: $zindexModal; - width: 560px; - margin-left: -280px; - background-color: $white; - border: 1px solid #999; - border: 1px solid rgba(0,0,0,.3); - *border: 1px solid #999; /* IE6-7 */ - @include ctb-border-radius(6px); - @include ctb-box-shadow(0 3px 7px rgba(0,0,0,0.3)); - @include ctb-background-clip(padding-box); - // Remove focus outline from opened modal - outline: none; - - &.fade { - @include ctb-transition('opacity .3s linear, top .3s ease-out'); - top: -25%; - } - &.fade.in { top: 10%; } -} -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; - // Close icon - .close { margin-top: 2px; } - // Heading - h3 { - margin: 0; - line-height: 30px; - } -} - -// Body (where all modal content resides) -.modal-body { - position: relative; - overflow-y: auto; - max-height: 400px; - padding: 15px; -} -// Remove bottom margin if need be -.modal-form { - margin-bottom: 0; -} - -// Footer (for actions) -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; // right align buttons - background-color: #f5f5f5; - border-top: 1px solid #ddd; - @include ctb-border-radius(0 0 6px 6px); - @include ctb-box-shadow(inset 0 1px 0 $white); - @include ctb-clearfix(); // clear it in case folks use .pull-* classes on buttons - - // Properly space out buttons - .btn + .btn { - margin-left: 5px; - margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs - } - // but override that for button groups - .btn-group .btn + .btn { - margin-left: -1px; - } - // and override it for block buttons as well - .btn-block + .btn-block { - margin-left: 0; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_navbar.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_navbar.scss deleted file mode 100644 index 45c073a..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_navbar.scss +++ /dev/null @@ -1,490 +0,0 @@ -// -// Navbars (Redux) -// -------------------------------------------------- - - -// COMMON STYLES -// ------------- - -// Base class and wrapper -.navbar { - overflow: visible; - margin-bottom: $baseLineHeight; - - // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar - *position: relative; - *z-index: 2; -} - -// Inner for background effects -// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present -.navbar-inner { - min-height: $navbarHeight; - padding-left: 20px; - padding-right: 20px; - @include ctb-gradient-vertical($navbarBackgroundHighlight, $navbarBackground); - border: 1px solid $navbarBorder; - @include ctb-border-radius($baseBorderRadius); - @include ctb-box-shadow(0 1px 4px rgba(0,0,0,.065)); - - // Prevent floats from breaking the navbar - @include ctb-clearfix(); -} - -// Set width to auto for default container -// We then reset it for fixed navbars in the #gridSystem mixin -.navbar .container { - width: auto; -} - -// Override the default collapsed state -.nav-collapse.collapse { - height: auto; - overflow: visible; -} - - -// Brand: website or project name -// ------------------------- -.navbar .brand { - float: left; - display: block; - // Vertically center the text given $navbarHeight - padding: (($navbarHeight - $baseLineHeight) / 2) 20px (($navbarHeight - $baseLineHeight) / 2); - margin-left: -20px; // negative indent to left-align the text down the page - font-size: 20px; - font-weight: 200; - color: $navbarBrandColor; - text-shadow: 0 1px 0 $navbarBackgroundHighlight; - &:hover { - text-decoration: none; - } -} - -// Plain text in topbar -// ------------------------- -.navbar-text { - margin-bottom: 0; - line-height: $navbarHeight; - color: $navbarText; -} - -// Janky solution for now to account for links outside the .nav -// ------------------------- -.navbar-link { - color: $navbarLinkColor; - &:hover { - color: $navbarLinkColorHover; - } -} - -// Dividers in navbar -// ------------------------- -.navbar .divider-vertical { - height: $navbarHeight; - margin: 0 9px; - border-left: 1px solid $navbarBackground; - border-right: 1px solid $navbarBackgroundHighlight; -} - -// Buttons in navbar -// ------------------------- -.navbar .btn, -.navbar .btn-group { - @include ctb-navbarVerticalAlign(30px); // Vertically center in navbar -} -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn { - margin-top: 0; // then undo the margin here so we don't accidentally double it -} - -// Navbar forms -// ------------------------- -.navbar-form { - margin-bottom: 0; // remove default bottom margin - @include ctb-clearfix(); - input, - select, - .radio, - .checkbox { - @include ctb-navbarVerticalAlign(30px); // Vertically center in navbar - } - input, - select, - .btn { - display: inline-block; - margin-bottom: 0; - } - input[type="image"], - input[type="checkbox"], - input[type="radio"] { - margin-top: 3px; - } - .input-append, - .input-prepend { - margin-top: 5px; - white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left - input { - margin-top: 0; // remove the margin on top since it's on the parent - } - } -} - -// Navbar search -// ------------------------- -.navbar-search { - position: relative; - float: left; - @include ctb-navbarVerticalAlign(30px); // Vertically center in navbar - margin-bottom: 0; - .search-query { - margin-bottom: 0; - padding: 4px 14px; - @include ctb-font-sans-serif(13px, normal, 1); - @include ctb-border-radius(15px); // redeclare because of specificity of the type attribute - } -} - - - -// Static navbar -// ------------------------- - -.navbar-static-top { - position: static; - margin-bottom: 0; // remove 18px margin for default navbar - .navbar-inner { - @include ctb-border-radius(0); - } -} - - - -// Fixed navbar -// ------------------------- - -// Shared (top/bottom) styles -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: $zindexFixedNavbar; - margin-bottom: 0; // remove 18px margin for default navbar -} -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - border-width: 0 0 1px; -} -.navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -} -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-left: 0; - padding-right: 0; - @include ctb-border-radius(0); -} - -// Reset container width -// Required here as we reset the width earlier on and the grid mixins don't override early enough -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - @include ctb-core-span($gridColumns); -} - -// Fixed to top -.navbar-fixed-top { - top: 0; -} -.navbar-fixed-top, -.navbar-static-top { - .navbar-inner { - @include ctb-box-shadow(#{0 1px 10px rgba(0,0,0,.1)}); - } -} - -// Fixed to bottom -.navbar-fixed-bottom { - bottom: 0; - .navbar-inner { - @include ctb-box-shadow(#{0 -1px 10px rgba(0,0,0,.1)}); - } -} - - - -// NAVIGATION -// ---------- - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; // redeclare due to specificity - margin-right: 0; // remove margin on float right nav -} -.navbar .nav > li { - float: left; -} - -// Links -.navbar .nav > li > a { - float: none; - // Vertically center the text given $navbarHeight - padding: (($navbarHeight - $baseLineHeight) / 2) 15px (($navbarHeight - $baseLineHeight) / 2); - color: $navbarLinkColor; - text-decoration: none; - text-shadow: 0 1px 0 $navbarBackgroundHighlight; -} -.navbar .nav .dropdown-toggle .caret { - margin-top: 8px; - -} - -// Hover -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active - color: $navbarLinkColorHover; - text-decoration: none; -} - -// Active nav items -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: $navbarLinkColorActive; - text-decoration: none; - background-color: $navbarLinkBackgroundActive; - @include ctb-box-shadow(inset 0 3px 8px rgba(0,0,0,.125)); -} - -// Navbar button for toggling navbar items in responsive layouts -// These definitions need to come after '.navbar .btn' -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - @include ctb-buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5%)); - @include ctb-box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)}); -} -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - @include ctb-border-radius(1px); - @include ctb-box-shadow(0 1px 0 rgba(0,0,0,.25)); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - - - -// Dropdown menus -// -------------- - -// Menu position and menu carets -.navbar .nav > li > .dropdown-menu { - &:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: $dropdownBorder; - position: absolute; - top: -7px; - left: 9px; - } - &:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid $dropdownBackground; - position: absolute; - top: -6px; - left: 10px; - } -} -// Menu position and menu caret support for dropups via extra dropup class -.navbar-fixed-bottom .nav > li > .dropdown-menu { - &:before { - border-top: 7px solid #ccc; - border-top-color: $dropdownBorder; - border-bottom: 0; - bottom: -7px; - top: auto; - } - &:after { - border-top: 6px solid $dropdownBackground; - border-bottom: 0; - bottom: -6px; - top: auto; - } -} - -// Caret should match text color on hover -.navbar .nav li.dropdown > a:hover .caret { - border-top-color: $navbarLinkColorActive; - border-bottom-color: $navbarLinkColorActive; -} - -// Remove background color from open dropdown -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: $navbarLinkBackgroundActive; - color: $navbarLinkColorActive; -} -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: $navbarLinkColor; - border-bottom-color: $navbarLinkColor; -} -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: $navbarLinkColorActive; - border-bottom-color: $navbarLinkColorActive; -} - -// Right aligned menus need alt position -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - left: auto; - right: 0; - &:before { - left: auto; - right: 12px; - } - &:after { - left: auto; - right: 13px; - } - .dropdown-menu { - left: auto; - right: 100%; - margin-left: 0; - margin-right: -1px; - @include ctb-border-radius(6px 0 6px 6px); - } -} - - -// Inverted navbar -// ------------------------- - -.navbar-inverse { - - .navbar-inner { - @include ctb-gradient-vertical($navbarInverseBackgroundHighlight, $navbarInverseBackground); - border-color: $navbarInverseBorder; - } - - .brand, - .nav > li > a { - color: $navbarInverseLinkColor; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - &:hover { - color: $navbarInverseLinkColorHover; - } - } - - .brand { - color: $navbarInverseBrandColor; - } - - .navbar-text { - color: $navbarInverseText; - } - - .nav > li > a:focus, - .nav > li > a:hover { - background-color: $navbarInverseLinkBackgroundHover; - color: $navbarInverseLinkColorHover; - } - - .nav .active > a, - .nav .active > a:hover, - .nav .active > a:focus { - color: $navbarInverseLinkColorActive; - background-color: $navbarInverseLinkBackgroundActive; - } - - // Inline text links - .navbar-link { - color: $navbarInverseLinkColor; - &:hover { - color: $navbarInverseLinkColorHover; - } - } - - // Dividers in navbar - .divider-vertical { - border-left-color: $navbarInverseBackground; - border-right-color: $navbarInverseBackgroundHighlight; - } - - // Dropdowns - .nav li.dropdown.open > .dropdown-toggle, - .nav li.dropdown.active > .dropdown-toggle, - .nav li.dropdown.open.active > .dropdown-toggle { - background-color: $navbarInverseLinkBackgroundActive; - color: $navbarInverseLinkColorActive; - } - .nav li.dropdown > a:hover .caret { - border-top-color: $navbarInverseLinkColorActive; - border-bottom-color: $navbarInverseLinkColorActive; - } - .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: $navbarInverseLinkColor; - border-bottom-color: $navbarInverseLinkColor; - } - .nav li.dropdown.open > .dropdown-toggle .caret, - .nav li.dropdown.active > .dropdown-toggle .caret, - .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: $navbarInverseLinkColorActive; - border-bottom-color: $navbarInverseLinkColorActive; - } - - // Navbar search - .navbar-search { - .search-query { - color: $white; - background-color: $navbarInverseSearchBackground; - border-color: $navbarInverseSearchBorder; - @include ctb-box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)}); - @include ctb-transition(none); - @include ctb-placeholder($navbarInverseSearchPlaceholderColor); - - // Focus states (we use .focused since IE7-8 and down doesn't support :focus) - &:focus, - &.focused { - padding: 5px 15px; - color: $grayDark; - text-shadow: 0 1px 0 $white; - background-color: $navbarInverseSearchBackgroundFocus; - border: 0; - @include ctb-box-shadow(0 0 3px rgba(0,0,0,.15)); - outline: 0; - } - } - } - - // Navbar collapse button - .btn-navbar { - @include ctb-buttonBackground(darken($navbarInverseBackgroundHighlight, 5%), darken($navbarInverseBackground, 5%)); - } - -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_navs.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_navs.scss deleted file mode 100644 index 44b2196..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_navs.scss +++ /dev/null @@ -1,391 +0,0 @@ -// -// Navs -// -------------------------------------------------- - - -// BASE CLASS -// ---------- - -.nav { - margin-left: 0; - margin-bottom: $baseLineHeight; - list-style: none; -} - -// Make links block level -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: $grayLighter; -} - -// Prevent IE8 from misplacing imgs -// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989 -.nav > li > a > img { - max-width: none; -} - -// Redeclare pull classes because of specifity -.nav > .pull-right { - float: right; -} - -// Nav headers (for dropdowns and lists) -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: $baseLineHeight; - color: $grayLight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - text-transform: uppercase; -} -// Space them out when they follow another list item (link) -.nav li + .nav-header { - margin-top: 9px; -} - - - -// NAV LIST -// -------- - -.nav-list { - padding-left: 15px; - padding-right: 15px; - margin-bottom: 0; -} -.nav-list > li > a, -.nav-list .nav-header { - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255,255,255,.5); -} -.nav-list > li > a { - padding: 3px 15px; -} -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: $white; - text-shadow: 0 -1px 0 rgba(0,0,0,.2); - background-color: $linkColor; -} -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - margin-right: 2px; -} -// Dividers (basically an hr) within the dropdown -.nav-list .divider { - @include ctb-nav-divider(); -} - - - -// TABS AND PILLS -// ------------- - -// Common styles -.nav-tabs, -.nav-pills { - @include ctb-clearfix(); -} -.nav-tabs > li, -.nav-pills > li { - float: left; -} -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; // keeps the overall height an even number -} - -// TABS -// ---- - -// Give the tabs something to sit on -.nav-tabs { - border-bottom: 1px solid #ddd; -} -// Make the list-items overlay the bottom border -.nav-tabs > li { - margin-bottom: -1px; -} -// Actual tabs (as links) -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: $baseLineHeight; - border: 1px solid transparent; - @include ctb-border-radius(4px 4px 0 0); - &:hover { - border-color: $grayLighter $grayLighter #ddd; - } -} -// Active state, and it's :hover to override normal :hover -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: $gray; - background-color: $bodyBackground; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} - - -// PILLS -// ----- - -// Links rendered as pills -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - @include ctb-border-radius(5px); -} - -// Active state -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: $white; - background-color: $linkColor; -} - - - -// STACKED NAV -// ----------- - -// Stacked tabs and pills -.nav-stacked > li { - float: none; -} -.nav-stacked > li > a { - margin-right: 0; // no need for the gap between nav items -} - -// Tabs -.nav-tabs.nav-stacked { - border-bottom: 0; -} -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - @include ctb-border-radius(0); -} -.nav-tabs.nav-stacked > li:first-child > a { - @include ctb-border-top-radius(4px); -} -.nav-tabs.nav-stacked > li:last-child > a { - @include ctb-border-bottom-radius(4px); -} -.nav-tabs.nav-stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} - -// Pills -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; // decrease margin to match sizing of stacked tabs -} - - - -// DROPDOWNS -// --------- - -.nav-tabs .dropdown-menu { - @include ctb-border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu -} -.nav-pills .dropdown-menu { - @include ctb-border-radius(6px); // make rounded corners match the pills -} - -// Default dropdown links -// ------------------------- -// Make carets use linkColor to start -.nav .dropdown-toggle .caret { - border-top-color: $linkColor; - border-bottom-color: $linkColor; - margin-top: 6px; -} -.nav .dropdown-toggle:hover .caret { - border-top-color: $linkColorHover; - border-bottom-color: $linkColorHover; -} -/* move down carets for tabs */ -.nav-tabs .dropdown-toggle .caret { - margin-top: 8px; -} - -// Active dropdown links -// ------------------------- -.nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} -.nav-tabs .active .dropdown-toggle .caret { - border-top-color: $gray; - border-bottom-color: $gray; -} - -// Active:hover dropdown links -// ------------------------- -.nav > .dropdown.active > a:hover { - cursor: pointer; -} - -// Open dropdowns -// ------------------------- -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: $white; - background-color: $grayLight; - border-color: $grayLight; -} -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: $white; - border-bottom-color: $white; - @include ctb-opacity(1); -} - -// Dropdowns in stacked tabs -.tabs-stacked .open > a:hover { - border-color: $grayLight; -} - - - -// TABBABLE -// -------- - - -// COMMON STYLES -// ------------- - -// Clear any floats -.tabbable { - @include ctb-clearfix(); -} -.tab-content { - overflow: auto; // prevent content from running below tabs -} - -// Remove border on bottom, left, right -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -// Show/hide tabbable areas -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} -.tab-content > .active, -.pill-content > .active { - display: block; -} - - -// BOTTOM -// ------ - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below > .nav-tabs > li > a { - @include ctb-border-radius(0 0 4px 4px); - &:hover { - border-bottom-color: transparent; - border-top-color: #ddd; - } -} -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -// LEFT & RIGHT -// ------------ - -// Common styles -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -// Tabs on the left -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - @include ctb-border-radius(4px 0 0 4px); -} -.tabs-left > .nav-tabs > li > a:hover { - border-color: $grayLighter #ddd $grayLighter $grayLighter; -} -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: $white; -} - -// Tabs on the right -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - @include ctb-border-radius(0 4px 4px 0); -} -.tabs-right > .nav-tabs > li > a:hover { - border-color: $grayLighter $grayLighter $grayLighter #ddd; -} -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: $white; -} - - - -// DISABLED STATES -// --------------- - -// Gray out text -.nav > .disabled > a { - color: $grayLight; -} -// Nuke hover effects -.nav > .disabled > a:hover { - text-decoration: none; - background-color: transparent; - cursor: default; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_pager.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_pager.scss deleted file mode 100644 index cfe9f80..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_pager.scss +++ /dev/null @@ -1,41 +0,0 @@ -// -// Pager pagination -// -------------------------------------------------- - - -.pager { - margin: $baseLineHeight 0; - list-style: none; - text-align: center; - @include ctb-clearfix(); -} -.pager li { - display: inline; -} -.pager li > a, -.pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - @include ctb-border-radius(15px); -} -.pager li > a:hover { - text-decoration: none; - background-color: #f5f5f5; -} -.pager .next > a, -.pager .next > span { - float: right; -} -.pager .previous > a, -.pager .previous > span { - float: left; -} -.pager .disabled > a, -.pager .disabled > a:hover, -.pager .disabled > span { - color: $grayLight; - background-color: #fff; - cursor: default; -} \ No newline at end of file diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_pagination.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_pagination.scss deleted file mode 100644 index 5dd174a..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_pagination.scss +++ /dev/null @@ -1,121 +0,0 @@ -// -// Pagination (multiple pages) -// -------------------------------------------------- - -// Space out pagination from surrounding content -.pagination { - margin: $baseLineHeight 0; -} - -.pagination ul { - // Allow for text-based alignment - display: inline-block; - @include ctb-ie7-inline-block(); - // Reset default ul styles - margin-left: 0; - margin-bottom: 0; - // Visuals - @include ctb-border-radius($baseBorderRadius); - @include ctb-box-shadow(0 1px 2px rgba(0,0,0,.05)); -} -.pagination ul > li { - display: inline; // Remove list-style and block-level defaults -} -.pagination ul > li > a, -.pagination ul > li > span { - float: left; // Collapse white-space - padding: 4px 12px; - line-height: $baseLineHeight; - text-decoration: none; - background-color: $paginationBackground; - border: 1px solid $paginationBorder; - border-left-width: 0; -} -.pagination ul > li > a:hover, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: $paginationActiveBackground; -} -.pagination ul > .active > a, -.pagination ul > .active > span { - color: $grayLight; - cursor: default; -} -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover { - color: $grayLight; - background-color: transparent; - cursor: default; -} -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - @include ctb-border-left-radius($baseBorderRadius); -} -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - @include ctb-border-right-radius($baseBorderRadius); -} - - -// Alignment -// -------------------------------------------------- - -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} - - -// Sizing -// -------------------------------------------------- - -// Large -.pagination-large { - ul > li > a, - ul > li > span { - padding: $paddingLarge; - font-size: $fontSizeLarge; - } - ul > li:first-child > a, - ul > li:first-child > span { - @include ctb-border-left-radius($borderRadiusLarge); - } - ul > li:last-child > a, - ul > li:last-child > span { - @include ctb-border-right-radius($borderRadiusLarge); - } -} - -// Small and mini -.pagination-mini, -.pagination-small { - ul > li:first-child > a, - ul > li:first-child > span { - @include ctb-border-left-radius($borderRadiusSmall); - } - ul > li:last-child > a, - ul > li:last-child > span { - @include ctb-border-right-radius($borderRadiusSmall); - } -} - -// Small -.pagination-small { - ul > li > a, - ul > li > span { - padding: $paddingSmall; - font-size: $fontSizeSmall; - } -} -// Mini -.pagination-mini { - ul > li > a, - ul > li > span { - padding: $paddingMini; - font-size: $fontSizeMini; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_popovers.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_popovers.scss deleted file mode 100644 index 998562e..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_popovers.scss +++ /dev/null @@ -1,129 +0,0 @@ -// -// Popovers -// -------------------------------------------------- - - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: $zindexPopover; - display: none; - width: 236px; - padding: 1px; - text-align: left; // Reset given new insertion method - background-color: $popoverBackground; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - border: 1px solid #ccc; - border: 1px solid rgba(0,0,0,.2); - @include ctb-border-radius(6px); - @include ctb-box-shadow(0 5px 10px rgba(0,0,0,.2)); - - // Overrides for proper insertion - white-space: normal; - - // Offset the popover to account for the popover arrow - &.top { margin-top: -10px; } - &.right { margin-left: 10px; } - &.bottom { margin-top: 10px; } - &.left { margin-left: -10px; } -} - -.popover-title { - margin: 0; // reset heading margin - padding: 8px 14px; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: $popoverTitleBackground; - border-bottom: 1px solid darken($popoverTitleBackground, 5%); - @include ctb-border-radius(5px 5px 0 0); -} - -.popover-content { - padding: 9px 14px; -} - -// Arrows -// -// .arrow is outer, .arrow:after is inner - -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} -.popover .arrow { - border-width: $popoverArrowOuterWidth; -} -.popover .arrow:after { - border-width: $popoverArrowWidth; - content: ""; -} - -.popover { - &.top .arrow { - left: 50%; - margin-left: -$popoverArrowOuterWidth; - border-bottom-width: 0; - border-top-color: #999; // IE8 fallback - border-top-color: $popoverArrowOuterColor; - bottom: -$popoverArrowOuterWidth; - &:after { - bottom: 1px; - margin-left: -$popoverArrowWidth; - border-bottom-width: 0; - border-top-color: $popoverArrowColor; - } - } - &.right .arrow { - top: 50%; - left: -$popoverArrowOuterWidth; - margin-top: -$popoverArrowOuterWidth; - border-left-width: 0; - border-right-color: #999; // IE8 fallback - border-right-color: $popoverArrowOuterColor; - &:after { - left: 1px; - bottom: -$popoverArrowWidth; - border-left-width: 0; - border-right-color: $popoverArrowColor; - } - } - &.bottom .arrow { - left: 50%; - margin-left: -$popoverArrowOuterWidth; - border-top-width: 0; - border-bottom-color: #999; // IE8 fallback - border-bottom-color: $popoverArrowOuterColor; - top: -$popoverArrowOuterWidth; - &:after { - top: 1px; - margin-left: -$popoverArrowWidth; - border-top-width: 0; - border-bottom-color: $popoverArrowColor; - } - } - - &.left .arrow { - top: 50%; - right: -$popoverArrowOuterWidth; - margin-top: -$popoverArrowOuterWidth; - border-right-width: 0; - border-left-color: #999; // IE8 fallback - border-left-color: $popoverArrowOuterColor; - &:after { - right: 1px; - border-right-width: 0; - border-left-color: $popoverArrowColor; - bottom: -$popoverArrowWidth; - } - } - -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_progress-bars.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_progress-bars.scss deleted file mode 100644 index e423c25..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_progress-bars.scss +++ /dev/null @@ -1,122 +0,0 @@ -// -// Progress bars -// -------------------------------------------------- - - -// ANIMATIONS -// ---------- - -// Webkit -@-webkit-keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - -// Firefox -@-moz-keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - -// IE9 -@-ms-keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - -// Opera -@-o-keyframes progress-bar-stripes { - from { background-position: 0 0; } - to { background-position: 40px 0; } -} - -// Spec -@keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - - - -// THE BARS -// -------- - -// Outer container -.progress { - overflow: hidden; - height: $baseLineHeight; - margin-bottom: $baseLineHeight; - @include ctb-gradient-vertical(#f5f5f5, #f9f9f9); - @include ctb-box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); - @include ctb-border-radius($baseBorderRadius); -} - -// Bar of progress -.progress .bar { - width: 0%; - height: 100%; - color: $white; - float: left; - font-size: 12px; - text-align: center; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - @include ctb-gradient-vertical(#149bdf, #0480be); - @include ctb-box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); - @include ctb-box-sizing(border-box); - @include ctb-transition(width .6s ease); -} -.progress .bar + .bar { - @include ctb-box-shadow(#{inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)}); -} - -// Striped bars -.progress-striped .bar { - @include ctb-gradient-striped(#149bdf); - @include ctb-background-size(40px 40px); -} - -// Call animation for the active one -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - - - -// COLORS -// ------ - -// Danger (red) -.progress-danger .bar, .progress .bar-danger { - @include ctb-gradient-vertical(#ee5f5b, #c43c35); -} -.progress-danger.progress-striped .bar, .progress-striped .bar-danger { - @include ctb-gradient-striped(#ee5f5b); -} - -// Success (green) -.progress-success .bar, .progress .bar-success { - @include ctb-gradient-vertical(#62c462, #57a957); -} -.progress-success.progress-striped .bar, .progress-striped .bar-success { - @include ctb-gradient-striped(#62c462); -} - -// Info (teal) -.progress-info .bar, .progress .bar-info { - @include ctb-gradient-vertical(#5bc0de, #339bb9); -} -.progress-info.progress-striped .bar, .progress-striped .bar-info { - @include ctb-gradient-striped(#5bc0de); -} - -// Warning (orange) -.progress-warning .bar, .progress .bar-warning { - @include ctb-gradient-vertical(lighten($orange, 15%), $orange); -} -.progress-warning.progress-striped .bar, .progress-striped .bar-warning { - @include ctb-gradient-striped(lighten($orange, 15%)); -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_reset.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_reset.scss deleted file mode 100644 index 36f5ffc..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_reset.scss +++ /dev/null @@ -1,216 +0,0 @@ -// -// Reset CSS -// Adapted from http://github.com/necolas/normalize.css -// -------------------------------------------------- - - -// Display in IE6-9 and FF3 -// ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -// Display block in IE6-9 and FF3 -// ------------------------- - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -// Prevents modern browsers from displaying 'audio' without controls -// ------------------------- - -audio:not([controls]) { - display: none; -} - -// Base settings -// ------------------------- - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -// Focus states -a:focus { - @include ctb-tab-focus(); -} -// Hover & Active -a:hover, -a:active { - outline: 0; -} - -// Prevents sub and sup affecting line-height in all browsers -// ------------------------- - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} - -// Img border in a's and image quality -// ------------------------- - -img { - /* Responsive images (ensure images don't scale beyond their parents) */ - max-width: 100%; /* Part 1: Set a maxium relative to the parent */ - width: auto\9; /* IE7-8 need help adjusting responsive images */ - height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ - - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -// Prevent max-width from affecting Google Maps -#map_canvas img, -.google-maps img { - max-width: none; -} - -// Forms -// ------------------------- - -// Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, -input { - *overflow: visible; // Inner spacing ie IE6/7 - line-height: normal; // FF3/4 have !important on line-height in UA stylesheet -} -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 - padding: 0; - border: 0; -} -button, -html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -input[type="search"] { // Appearance in Safari/Chrome - @include ctb-box-sizing(content-box); - -webkit-appearance: textfield; -} -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 -} -textarea { - overflow: auto; // Remove vertical scrollbar in IE6-9 - vertical-align: top; // Readability and alignment cross-browser -} - - -// Printing -// ------------------------- -// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css - -@media print { - - * { - text-shadow: none !important; - color: #000 !important; // Black prints faster: h5bp.com/s - background: transparent !important; - box-shadow: none !important; - } - - a, - a:visited { - text-decoration: underline; - } - - a[href]:after { - content: " (" attr(href) ")"; - } - - abbr[title]:after { - content: " (" attr(title) ")"; - } - - // Don't show links for images, or javascript/internal links - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - - thead { - display: table-header-group; // h5bp.com/t - } - - tr, - img { - page-break-inside: avoid; - } - - img { - max-width: 100% !important; - } - - @page { - margin: 0.5cm; - } - - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - - h2, - h3 { - page-break-after: avoid; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-1200px-min.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-1200px-min.scss deleted file mode 100644 index f0dce21..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-1200px-min.scss +++ /dev/null @@ -1,28 +0,0 @@ -// -// Responsive: Large desktop and up -// -------------------------------------------------- - - -@media (min-width: 1200px) { - - // Fixed grid - @include ctb-grid-core($gridColumnWidth1200, $gridGutterWidth1200); - - // Fluid grid - @include ctb-grid-fluid($fluidGridColumnWidth1200, $fluidGridGutterWidth1200); - - // Input grid - @include ctb-grid-input($gridColumnWidth1200, $gridGutterWidth1200); - - // Thumbnails - .thumbnails { - margin-left: -$gridGutterWidth1200; - } - .thumbnails > li { - margin-left: $gridGutterWidth1200; - } - .row-fluid .thumbnails { - margin-left: 0; - } - -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-767px-max.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-767px-max.scss deleted file mode 100644 index ef6e90b..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-767px-max.scss +++ /dev/null @@ -1,193 +0,0 @@ -// -// Responsive: Landscape phone to desktop/tablet -// -------------------------------------------------- - - -@media (max-width: 767px) { - - // Padding to set content in a bit - body { - padding-left: 20px; - padding-right: 20px; - } - // Negative indent the now static "fixed" navbar - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-left: -20px; - margin-right: -20px; - } - // Remove padding on container given explicit padding set on body - .container-fluid { - padding: 0; - } - - // TYPOGRAPHY - // ---------- - // Reset horizontal dl - .dl-horizontal { - dt { - float: none; - clear: none; - width: auto; - text-align: left; - } - dd { - margin-left: 0; - } - } - - // GRID & CONTAINERS - // ----------------- - // Remove width from containers - .container { - width: auto; - } - // Fluid rows - .row-fluid { - width: 100%; - } - // Undo negative margin on rows and thumbnails - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; - margin-left: 0; // Reset the default margin for all li elements when no .span* classes are present - } - // Make all grid-sized elements block level again - [class*="span"], - .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing - .row-fluid [class*="span"] { - float: none; - display: block; - width: 100%; - margin-left: 0; - @include ctb-box-sizing(border-box); - } - .span12, - .row-fluid .span12 { - width: 100%; - @include ctb-box-sizing(border-box); - } - .row-fluid [class*="offset"]:first-child { - margin-left: 0; - } - - // FORM FIELDS - // ----------- - // Make span* classes full width - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - @include ctb-input-block-level(); - } - // But don't let it screw up prepend/append inputs - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; // redeclare so they don't wrap to new lines - width: auto; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - - // Modals - .modal { - position: fixed; - top: 20px; - left: 20px; - right: 20px; - width: auto; - margin: 0; - &.fade { top: -100px; } - &.fade.in { top: 20px; } - } - -} - - - -// UP TO LANDSCAPE PHONE -// --------------------- - -@media (max-width: 480px) { - - // Smooth out the collapsing/expanding nav - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); // activate the GPU - } - - // Block level the page header small tag for readability - .page-header h1 small { - display: block; - line-height: $baseLineHeight; - } - - // Update checkboxes for iOS - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - - // Remove the horizontal form styles - .form-horizontal { - .control-label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - // Move over all input controls and content - .controls { - margin-left: 0; - } - // Move the options list down to align with labels - .control-list { - padding-top: 0; // has to be padding because margin collaspes - } - // Move over buttons in .form-actions to align with .controls - .form-actions { - padding-left: 10px; - padding-right: 10px; - } - } - - // Medias - // Reset float and spacing to stack - .media .pull-left, - .media .pull-right { - float: none; - display: block; - margin-bottom: 10px; - } - // Remove side margins since we stack instead of indent - .media-object { - margin-right: 0; - margin-left: 0; - } - - // Modals - .modal { - top: 10px; - left: 10px; - right: 10px; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - - // Carousel - .carousel-caption { - position: static; - } - -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-768px-979px.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-768px-979px.scss deleted file mode 100644 index 19dedb5..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-768px-979px.scss +++ /dev/null @@ -1,19 +0,0 @@ -// -// Responsive: Tablet to desktop -// -------------------------------------------------- - - -@media (min-width: 768px) and (max-width: 979px) { - - // Fixed grid - @include ctb-grid-core($gridColumnWidth768, $gridGutterWidth768); - - // Fluid grid - @include ctb-grid-fluid($fluidGridColumnWidth768, $fluidGridGutterWidth768); - - // Input grid - @include ctb-grid-input($gridColumnWidth768, $gridGutterWidth768); - - // No need to reset .thumbnails here since it's the same $gridGutterWidth - -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-navbar.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-navbar.scss deleted file mode 100644 index 2a13138..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-navbar.scss +++ /dev/null @@ -1,185 +0,0 @@ -// -// Responsive: Navbar -// -------------------------------------------------- - - -// TABLETS AND BELOW -// ----------------- -@media (max-width: $navbarCollapseWidth) { - - // UNFIX THE TOPBAR - // ---------------- - // Remove any padding from the body - body { - padding-top: 0; - } - // Unfix the navbars - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: $baseLineHeight; - } - .navbar-fixed-bottom { - margin-top: $baseLineHeight; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - // Account for brand name - .navbar .brand { - padding-left: 10px; - padding-right: 10px; - margin: 0 0 0 -5px; - } - - // COLLAPSIBLE NAVBAR - // ------------------ - // Nav collapse clears brand - .nav-collapse { - clear: both; - } - // Block-level the nav - .nav-collapse .nav { - float: none; - margin: 0 0 ($baseLineHeight / 2); - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: $navbarText; - text-shadow: none; - } - // Nav and dropdown links in navbar - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 9px 15px; - font-weight: bold; - color: $navbarLinkColor; - @include ctb-border-radius(3px); - } - // Buttons - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - @include ctb-border-radius($baseBorderRadius); - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: $navbarBackground; - } - .navbar-inverse .nav-collapse .nav > li > a, - .navbar-inverse .nav-collapse .dropdown-menu a { - color: $navbarInverseLinkColor; - } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { - background-color: $navbarInverseBackground; - } - // Buttons in the navbar - .nav-collapse.in .btn-group { - margin-top: 5px; - padding: 0; - } - // Dropdowns in the navbar - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - float: none; - display: none; - max-width: none; - margin: 0 15px; - padding: 0; - background-color: transparent; - border: none; - @include ctb-border-radius(0); - @include ctb-box-shadow(none); - } - .nav-collapse .open > .dropdown-menu { - display: block; - } - - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu { - &:before, - &:after { - display: none; - } - } - // Forms in navbar - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: ($baseLineHeight / 2) 15px; - margin: ($baseLineHeight / 2) 0; - border-top: 1px solid $navbarBackground; - border-bottom: 1px solid $navbarBackground; - @include ctb-box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)}); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: $navbarInverseBackground; - border-bottom-color: $navbarInverseBackground; - } - // Pull right (secondary) nav content - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - // Hide everything in the navbar save .brand and toggle button */ - .nav-collapse, - .nav-collapse.collapse { - overflow: hidden; - height: 0; - } - // Navbar button - .navbar .btn-navbar { - display: block; - } - - // STATIC NAVBAR - // ------------- - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - - -} - - -// DEFAULT DESKTOP -// --------------- - -@media (min-width: $navbarCollapseDesktopWidth) { - - // Required to make the collapsing navbar work on regular desktops - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } - -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-utilities.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-utilities.scss deleted file mode 100644 index 2c3f6c1..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive-utilities.scss +++ /dev/null @@ -1,43 +0,0 @@ -// -// Responsive: Utility classes -// -------------------------------------------------- - - -// Hide from screenreaders and browsers -// Credit: HTML5 Boilerplate -.hidden { - display: none; - visibility: hidden; -} - -// Visibility utilities - -// For desktops -.visible-phone { display: none !important; } -.visible-tablet { display: none !important; } -.hidden-phone { } -.hidden-tablet { } -.hidden-desktop { display: none !important; } -.visible-desktop { display: inherit !important; } - -// Tablets & small desktops only -@media (min-width: 768px) and (max-width: 979px) { - // Hide everything else - .hidden-desktop { display: inherit !important; } - .visible-desktop { display: none !important ; } - // Show - .visible-tablet { display: inherit !important; } - // Hide - .hidden-tablet { display: none !important; } -} - -// Phones only -@media (max-width: 767px) { - // Hide everything else - .hidden-desktop { display: inherit !important; } - .visible-desktop { display: none !important; } - // Show - .visible-phone { display: inherit !important; } // Use inherit to restore previous behavior - // Hide - .hidden-phone { display: none !important; } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive.scss deleted file mode 100644 index 3a90469..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_responsive.scss +++ /dev/null @@ -1,48 +0,0 @@ -/*! - * Bootstrap Responsive v2.1.0 - * - * 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.scss -// 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"; diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_scaffolding.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_scaffolding.scss deleted file mode 100644 index 67cfbd4..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_scaffolding.scss +++ /dev/null @@ -1,52 +0,0 @@ -// -// Scaffolding -// -------------------------------------------------- - - -// Body reset -// ------------------------- - -body { - margin: 0; - font-family: $baseFontFamily; - font-size: $baseFontSize; - line-height: $baseLineHeight; - color: $textColor; - background-color: $bodyBackground; -} - - -// Links -// ------------------------- - -a { - color: $linkColor; - text-decoration: none; -} -a:hover { - color: $linkColorHover; - text-decoration: underline; -} - - -// Images -// ------------------------- - -// Rounded corners -.img-rounded { - @include ctb-border-radius(6px); -} - -// Add polaroid-esque trim -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0,0,0,.2); - @include ctb-box-shadow(0 1px 3px rgba(0,0,0,.1)); -} - -// Perfect circle -.img-circle { - @include ctb-border-radius(500px); // crank the border-radius so it works with most reasonably sized images -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_sprites.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_sprites.scss deleted file mode 100644 index 60cba52..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_sprites.scss +++ /dev/null @@ -1,193 +0,0 @@ -// -// Sprites -// -------------------------------------------------- - - -// ICONS -// ----- - -// All icons receive the styles of the tag with a base class -// of .i and are then given a unique class to add width, height, -// and background-position. Your resulting HTML will look like -// . - -// For the white version of the icons, just add the .icon-white class: -// - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - @include ctb-ie7-restore-right-whitespace(); - line-height: 14px; - vertical-align: text-top; - background-image: image-url("#{$iconSpritePath}"); - background-position: 14px 14px; - background-repeat: no-repeat; - margin-top: 1px; -} - -/* White icons with optional class, or on hover/active states of certain elements */ -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: image-url("#{$iconWhiteSpritePath}"); -} - -.icon-glass { background-position: 0 0; } -.icon-music { background-position: -24px 0; } -.icon-search { background-position: -48px 0; } -.icon-envelope { background-position: -72px 0; } -.icon-heart { background-position: -96px 0; } -.icon-star { background-position: -120px 0; } -.icon-star-empty { background-position: -144px 0; } -.icon-user { background-position: -168px 0; } -.icon-film { background-position: -192px 0; } -.icon-th-large { background-position: -216px 0; } -.icon-th { background-position: -240px 0; } -.icon-th-list { background-position: -264px 0; } -.icon-ok { background-position: -288px 0; } -.icon-remove { background-position: -312px 0; } -.icon-zoom-in { background-position: -336px 0; } -.icon-zoom-out { background-position: -360px 0; } -.icon-off { background-position: -384px 0; } -.icon-signal { background-position: -408px 0; } -.icon-cog { background-position: -432px 0; } -.icon-trash { background-position: -456px 0; } - -.icon-home { background-position: 0 -24px; } -.icon-file { background-position: -24px -24px; } -.icon-time { background-position: -48px -24px; } -.icon-road { background-position: -72px -24px; } -.icon-download-alt { background-position: -96px -24px; } -.icon-download { background-position: -120px -24px; } -.icon-upload { background-position: -144px -24px; } -.icon-inbox { background-position: -168px -24px; } -.icon-play-circle { background-position: -192px -24px; } -.icon-repeat { background-position: -216px -24px; } -.icon-refresh { background-position: -240px -24px; } -.icon-list-alt { background-position: -264px -24px; } -.icon-lock { background-position: -287px -24px; } // 1px off -.icon-flag { background-position: -312px -24px; } -.icon-headphones { background-position: -336px -24px; } -.icon-volume-off { background-position: -360px -24px; } -.icon-volume-down { background-position: -384px -24px; } -.icon-volume-up { background-position: -408px -24px; } -.icon-qrcode { background-position: -432px -24px; } -.icon-barcode { background-position: -456px -24px; } - -.icon-tag { background-position: 0 -48px; } -.icon-tags { background-position: -25px -48px; } // 1px off -.icon-book { background-position: -48px -48px; } -.icon-bookmark { background-position: -72px -48px; } -.icon-print { background-position: -96px -48px; } -.icon-camera { background-position: -120px -48px; } -.icon-font { background-position: -144px -48px; } -.icon-bold { background-position: -167px -48px; } // 1px off -.icon-italic { background-position: -192px -48px; } -.icon-text-height { background-position: -216px -48px; } -.icon-text-width { background-position: -240px -48px; } -.icon-align-left { background-position: -264px -48px; } -.icon-align-center { background-position: -288px -48px; } -.icon-align-right { background-position: -312px -48px; } -.icon-align-justify { background-position: -336px -48px; } -.icon-list { background-position: -360px -48px; } -.icon-indent-left { background-position: -384px -48px; } -.icon-indent-right { background-position: -408px -48px; } -.icon-facetime-video { background-position: -432px -48px; } -.icon-picture { background-position: -456px -48px; } - -.icon-pencil { background-position: 0 -72px; } -.icon-map-marker { background-position: -24px -72px; } -.icon-adjust { background-position: -48px -72px; } -.icon-tint { background-position: -72px -72px; } -.icon-edit { background-position: -96px -72px; } -.icon-share { background-position: -120px -72px; } -.icon-check { background-position: -144px -72px; } -.icon-move { background-position: -168px -72px; } -.icon-step-backward { background-position: -192px -72px; } -.icon-fast-backward { background-position: -216px -72px; } -.icon-backward { background-position: -240px -72px; } -.icon-play { background-position: -264px -72px; } -.icon-pause { background-position: -288px -72px; } -.icon-stop { background-position: -312px -72px; } -.icon-forward { background-position: -336px -72px; } -.icon-fast-forward { background-position: -360px -72px; } -.icon-step-forward { background-position: -384px -72px; } -.icon-eject { background-position: -408px -72px; } -.icon-chevron-left { background-position: -432px -72px; } -.icon-chevron-right { background-position: -456px -72px; } - -.icon-plus-sign { background-position: 0 -96px; } -.icon-minus-sign { background-position: -24px -96px; } -.icon-remove-sign { background-position: -48px -96px; } -.icon-ok-sign { background-position: -72px -96px; } -.icon-question-sign { background-position: -96px -96px; } -.icon-info-sign { background-position: -120px -96px; } -.icon-screenshot { background-position: -144px -96px; } -.icon-remove-circle { background-position: -168px -96px; } -.icon-ok-circle { background-position: -192px -96px; } -.icon-ban-circle { background-position: -216px -96px; } -.icon-arrow-left { background-position: -240px -96px; } -.icon-arrow-right { background-position: -264px -96px; } -.icon-arrow-up { background-position: -289px -96px; } // 1px off -.icon-arrow-down { background-position: -312px -96px; } -.icon-share-alt { background-position: -336px -96px; } -.icon-resize-full { background-position: -360px -96px; } -.icon-resize-small { background-position: -384px -96px; } -.icon-plus { background-position: -408px -96px; } -.icon-minus { background-position: -433px -96px; } -.icon-asterisk { background-position: -456px -96px; } - -.icon-exclamation-sign { background-position: 0 -120px; } -.icon-gift { background-position: -24px -120px; } -.icon-leaf { background-position: -48px -120px; } -.icon-fire { background-position: -72px -120px; } -.icon-eye-open { background-position: -96px -120px; } -.icon-eye-close { background-position: -120px -120px; } -.icon-warning-sign { background-position: -144px -120px; } -.icon-plane { background-position: -168px -120px; } -.icon-calendar { background-position: -192px -120px; } -.icon-random { background-position: -216px -120px; width: 16px; } -.icon-comment { background-position: -240px -120px; } -.icon-magnet { background-position: -264px -120px; } -.icon-chevron-up { background-position: -288px -120px; } -.icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off -.icon-retweet { background-position: -336px -120px; } -.icon-shopping-cart { background-position: -360px -120px; } -.icon-folder-close { background-position: -384px -120px; } -.icon-folder-open { background-position: -408px -120px; width: 16px; } -.icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off -.icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off - -.icon-hdd { background-position: 0 -144px; } -.icon-bullhorn { background-position: -24px -144px; } -.icon-bell { background-position: -48px -144px; } -.icon-certificate { background-position: -72px -144px; } -.icon-thumbs-up { background-position: -96px -144px; } -.icon-thumbs-down { background-position: -120px -144px; } -.icon-hand-right { background-position: -144px -144px; } -.icon-hand-left { background-position: -168px -144px; } -.icon-hand-up { background-position: -192px -144px; } -.icon-hand-down { background-position: -216px -144px; } -.icon-circle-arrow-right { background-position: -240px -144px; } -.icon-circle-arrow-left { background-position: -264px -144px; } -.icon-circle-arrow-up { background-position: -288px -144px; } -.icon-circle-arrow-down { background-position: -312px -144px; } -.icon-globe { background-position: -336px -144px; } -.icon-wrench { background-position: -360px -144px; } -.icon-tasks { background-position: -384px -144px; } -.icon-filter { background-position: -408px -144px; } -.icon-briefcase { background-position: -432px -144px; } -.icon-fullscreen { background-position: -456px -144px; } diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_tables.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_tables.scss deleted file mode 100644 index ead1c66..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_tables.scss +++ /dev/null @@ -1,237 +0,0 @@ -// -// Tables -// -------------------------------------------------- - - -// BASE TABLES -// ----------------- - -table { - max-width: 100%; - background-color: $tableBackground; - border-collapse: collapse; - border-spacing: 0; -} - -// BASELINE STYLES -// --------------- - -.table { - width: 100%; - margin-bottom: $baseLineHeight; - // Cells - th, - td { - padding: 8px; - line-height: $baseLineHeight; - text-align: left; - vertical-align: top; - border-top: 1px solid $tableBorder; - } - th { - font-weight: bold; - } - // Bottom align for column headings - thead th { - vertical-align: bottom; - } - // Remove top border from thead by default - caption + thead tr:first-child th, - caption + thead tr:first-child td, - colgroup + thead tr:first-child th, - colgroup + thead tr:first-child td, - thead:first-child tr:first-child th, - thead:first-child tr:first-child td { - border-top: 0; - } - // Account for multiple tbody instances - tbody + tbody { - border-top: 2px solid $tableBorder; - } - - // Nesting - .table { - background-color: $bodyBackground; - } -} - - - -// CONDENSED TABLE W/ HALF PADDING -// ------------------------------- - -.table-condensed { - th, - td { - padding: 4px 5px; - } -} - - -// BORDERED VERSION -// ---------------- - -.table-bordered { - border: 1px solid $tableBorder; - border-collapse: separate; // Done so we can round those corners! - *border-collapse: collapse; // IE7 can't round corners anyway - border-left: 0; - @include ctb-border-radius($baseBorderRadius); - th, - td { - border-left: 1px solid $tableBorder; - } - // Prevent a double border - caption + thead tr:first-child th, - caption + tbody tr:first-child th, - caption + tbody tr:first-child td, - colgroup + thead tr:first-child th, - colgroup + tbody tr:first-child th, - colgroup + tbody tr:first-child td, - thead:first-child tr:first-child th, - tbody:first-child tr:first-child th, - tbody:first-child tr:first-child td { - border-top: 0; - } - // For first th or td in the first row in the first thead or tbody - thead:first-child tr:first-child > th:first-child, - tbody:first-child tr:first-child > td:first-child { - @include ctb-border-top-left-radius($baseBorderRadius); - } - thead:first-child tr:first-child > th:last-child, - tbody:first-child tr:first-child > td:last-child { - @include ctb-border-top-right-radius($baseBorderRadius); - } - // For first th or td in the last row in the last thead or tbody - thead:last-child tr:last-child > th:first-child, - tbody:last-child tr:last-child > td:first-child, - tfoot:last-child tr:last-child > td:first-child { - @include ctb-border-bottom-left-radius($baseBorderRadius); - } - thead:last-child tr:last-child > th:last-child, - tbody:last-child tr:last-child > td:last-child, - tfoot:last-child tr:last-child > td:last-child { - @include ctb-border-bottom-right-radius($baseBorderRadius); - } - - // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot - tfoot + tbody:last-child tr:last-child td:first-child { - @include ctb-border-bottom-left-radius(0); - } - tfoot + tbody:last-child tr:last-child td:last-child { - @include ctb-border-bottom-right-radius(0); - } - - - // Special fixes to round the left border on the first td/th - caption + thead tr:first-child th:first-child, - caption + tbody tr:first-child td:first-child, - colgroup + thead tr:first-child th:first-child, - colgroup + tbody tr:first-child td:first-child { - @include ctb-border-top-left-radius($baseBorderRadius); - } - caption + thead tr:first-child th:last-child, - caption + tbody tr:first-child td:last-child, - colgroup + thead tr:first-child th:last-child, - colgroup + tbody tr:first-child td:last-child { - @include ctb-border-top-right-radius($baseBorderRadius); - } - -} - - - - -// ZEBRA-STRIPING -// -------------- - -// Default zebra-stripe styles (alternating gray and transparent backgrounds) -.table-striped { - tbody { - > tr:nth-child(odd) > td, - > tr:nth-child(odd) > th { - background-color: $tableBackgroundAccent; - } - } -} - - -// HOVER EFFECT -// ------------ -// Placed here since it has to come after the potential zebra striping -.table-hover { - tbody { - tr:hover td, - tr:hover th { - background-color: $tableBackgroundHover; - } - } -} - - -// TABLE CELL SIZING -// ----------------- - -// Reset default grid behavior -table td[class*="span"], -table th[class*="span"], -.row-fluid table td[class*="span"], -.row-fluid table th[class*="span"] { - display: table-cell; - float: none; // undo default grid column styles - margin-left: 0; // undo default grid column styles -} - -// Change the column widths to account for td/th padding -.table td, -.table th { - &.span1 { @include ctb-tableColumns(1); } - &.span2 { @include ctb-tableColumns(2); } - &.span3 { @include ctb-tableColumns(3); } - &.span4 { @include ctb-tableColumns(4); } - &.span5 { @include ctb-tableColumns(5); } - &.span6 { @include ctb-tableColumns(6); } - &.span7 { @include ctb-tableColumns(7); } - &.span8 { @include ctb-tableColumns(8); } - &.span9 { @include ctb-tableColumns(9); } - &.span10 { @include ctb-tableColumns(10); } - &.span11 { @include ctb-tableColumns(11); } - &.span12 { @include ctb-tableColumns(12); } -} - - - -// TABLE BACKGROUNDS -// ----------------- -// Exact selectors below required to override .table-striped - -.table tbody tr { - &.success td { - background-color: $successBackground; - } - &.error td { - background-color: $errorBackground; - } - &.warning td { - background-color: $warningBackground; - } - &.info td { - background-color: $infoBackground; - } -} - -// Hover states for .table-hover -.table-hover tbody tr { - &.success:hover td { - background-color: darken($successBackground, 5%); - } - &.error:hover td { - background-color: darken($errorBackground, 5%); - } - &.warning:hover td { - background-color: darken($warningBackground, 5%); - } - &.info:hover td { - background-color: darken($infoBackground, 5%); - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_thumbnails.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_thumbnails.scss deleted file mode 100644 index 0c8a378..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_thumbnails.scss +++ /dev/null @@ -1,52 +0,0 @@ -// -// Thumbnails -// -------------------------------------------------- - - -// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files - -// Make wrapper ul behave like the grid -.thumbnails { - margin-left: -$gridGutterWidth; - list-style: none; - @include ctb-clearfix(); -} -// Fluid rows have no left margin -.row-fluid .thumbnails { - margin-left: 0; -} - -// Float li to make thumbnails appear in a row -.thumbnails > li { - float: left; // Explicity set the float since we don't require .span* classes - margin-bottom: $baseLineHeight; - margin-left: $gridGutterWidth; -} - -// The actual thumbnail (can be `a` or `div`) -.thumbnail { - display: block; - padding: 4px; - line-height: $baseLineHeight; - border: 1px solid #ddd; - @include ctb-border-radius($baseBorderRadius); - @include ctb-box-shadow(0 1px 3px rgba(0,0,0,.055)); - @include ctb-transition(all .2s ease-in-out); -} -// Add a hover state for linked versions only -a.thumbnail:hover { - border-color: $linkColor; - @include ctb-box-shadow(0 1px 4px rgba(0,105,214,.25)); -} - -// Images and captions -.thumbnail > img { - display: block; - max-width: 100%; - margin-left: auto; - margin-right: auto; -} -.thumbnail .caption { - padding: 9px; - color: $gray; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_tooltip.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_tooltip.scss deleted file mode 100644 index f7dda86..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_tooltip.scss +++ /dev/null @@ -1,70 +0,0 @@ -// -// Tooltips -// -------------------------------------------------- - - -// Base class -.tooltip { - position: absolute; - z-index: $zindexTooltip; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - @include ctb-opacity(0); - &.in { @include ctb-opacity(80); } - &.top { margin-top: -3px; } - &.right { margin-left: 3px; } - &.bottom { margin-top: 3px; } - &.left { margin-left: -3px; } -} - -// Wrapper for the tooltip content -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: $tooltipColor; - text-align: center; - text-decoration: none; - background-color: $tooltipBackground; - @include ctb-border-radius($baseBorderRadius); -} - -// Arrows -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} -.tooltip { - &.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -$tooltipArrowWidth; - border-width: $tooltipArrowWidth $tooltipArrowWidth 0; - border-top-color: $tooltipArrowColor; - } - &.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -$tooltipArrowWidth; - border-width: $tooltipArrowWidth $tooltipArrowWidth $tooltipArrowWidth 0; - border-right-color: $tooltipArrowColor; - } - &.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -$tooltipArrowWidth; - border-width: $tooltipArrowWidth 0 $tooltipArrowWidth $tooltipArrowWidth; - border-left-color: $tooltipArrowColor; - } - &.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -$tooltipArrowWidth; - border-width: 0 $tooltipArrowWidth $tooltipArrowWidth; - border-bottom-color: $tooltipArrowColor; - } -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_type.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_type.scss deleted file mode 100644 index bb5af8e..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_type.scss +++ /dev/null @@ -1,235 +0,0 @@ -// -// Typography -// -------------------------------------------------- - - -// Body text -// ------------------------- - -p { - margin: 0 0 $baseLineHeight / 2; -} -.lead { - margin-bottom: $baseLineHeight; - font-size: $baseFontSize * 1.5; - font-weight: 200; - line-height: $baseLineHeight * 1.5; -} - - -// Emphasis & misc -// ------------------------- - -// Ex: 14px base font * 85% = about 12px -small { font-size: 85%; } - -strong { font-weight: bold; } -em { font-style: italic; } -cite { font-style: normal; } - -// Utility classes -.muted { color: $grayLight; } -a.muted:hover { color: darken($grayLight, 10%); } - -.text-warning { color: $warningText; } -a.text-warning:hover { color: darken($warningText, 10%); } - -.text-error { color: $errorText; } -a.text-error:hover { color: darken($errorText, 10%); } - -.text-info { color: $infoText; } -a.text-info:hover { color: darken($infoText, 10%); } - -.text-success { color: $successText; } -a.text-success:hover { color: darken($successText, 10%); } - - -// Headings -// ------------------------- - -h1, h2, h3, h4, h5, h6 { - margin: ($baseLineHeight / 2) 0; - font-family: $headingsFontFamily; - font-weight: $headingsFontWeight; - line-height: $baseLineHeight; - color: $headingsColor; - text-rendering: optimizelegibility; // Fix the character spacing for headings - small { - font-weight: normal; - line-height: 1; - color: $grayLight; - } -} - -h1, -h2, -h3 { line-height: $baseLineHeight * 2; } - -h1 { font-size: $baseFontSize * 2.75; } // ~38px -h2 { font-size: $baseFontSize * 2.25; } // ~32px -h3 { font-size: $baseFontSize * 1.75; } // ~24px -h4 { font-size: $baseFontSize * 1.25; } // ~18px -h5 { font-size: $baseFontSize; } -h6 { font-size: $baseFontSize * 0.85; } // ~12px - -h1 small { font-size: $baseFontSize * 1.75; } // ~24px -h2 small { font-size: $baseFontSize * 1.25; } // ~18px -h3 small { font-size: $baseFontSize; } -h4 small { font-size: $baseFontSize; } - - -// Page header -// ------------------------- - -.page-header { - padding-bottom: ($baseLineHeight / 2) - 1; - margin: $baseLineHeight 0 ($baseLineHeight * 1.5); - border-bottom: 1px solid $grayLighter; -} - - - -// Lists -// -------------------------------------------------- - -// Unordered and Ordered lists -ul, ol { - padding: 0; - margin: 0 0 $baseLineHeight / 2 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -li { - line-height: $baseLineHeight; -} - -// Remove default list styles -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -// Single-line list items -ul.inline, -ol.inline { - margin-left: 0; - list-style: none; - & > li { - display: inline-block; - padding-left: 5px; - padding-right: 5px; - } -} - -// Description Lists -dl { - margin-bottom: $baseLineHeight; -} -dt, -dd { - line-height: $baseLineHeight; -} -dt { - font-weight: bold; -} -dd { - margin-left: $baseLineHeight / 2; -} -// Horizontal layout (like forms) -.dl-horizontal { - @include ctb-clearfix(); // Ensure dl clears floats if empty dd elements present - dt { - float: left; - width: $horizontalComponentOffset - 20; - clear: left; - text-align: right; - @include ctb-text-overflow(); - } - dd { - margin-left: $horizontalComponentOffset; - } -} - -// MISC -// ---- - -// Horizontal rules -hr { - margin: $baseLineHeight 0; - border: 0; - border-top: 1px solid $hrBorder; - border-bottom: 1px solid $white; -} - -// Abbreviations and acronyms -abbr[title], -// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257 -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted $grayLight; -} -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -// Blockquotes -blockquote { - padding: 0 0 0 15px; - margin: 0 0 $baseLineHeight; - border-left: 5px solid $grayLighter; - p { - margin-bottom: 0; - @include ctb-font-shorthand(16px,300,$baseLineHeight * 1.25); - } - small { - display: block; - line-height: $baseLineHeight; - color: $grayLight; - &:before { - content: '\2014 \00A0'; - } - } - - // Float right with text-align: right - &.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid $grayLighter; - border-left: 0; - p, - small { - text-align: right; - } - small { - &:before { - content: ''; - } - &:after { - content: '\00A0 \2014'; - } - } - } -} - -// Quotes -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -// Addresses -address { - display: block; - margin-bottom: $baseLineHeight; - font-style: normal; - line-height: $baseLineHeight; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_utilities.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_utilities.scss deleted file mode 100644 index 8ed1d87..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_utilities.scss +++ /dev/null @@ -1,32 +0,0 @@ -// -// Utility classes -// -------------------------------------------------- - - -// Quick floats -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.clearfix { - @include ctb-clearfix(); -} -// Toggling content -.hide { - display: none; -} -.show { - display: block; -} - -// Visibility -.invisible { - visibility: hidden; -} - -// For Affix plugin -.affix { - position: fixed; -} diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_variables.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_variables.scss deleted file mode 100644 index 3477ef5..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_variables.scss +++ /dev/null @@ -1,301 +0,0 @@ -// -// Variables -// -------------------------------------------------- - - -// Global values -// -------------------------------------------------- - - -// Grays -// ------------------------- -$black: #000 !default; -$grayDarker: #222 !default; -$grayDark: #333 !default; -$gray: #555 !default; -$grayLight: #999 !default; -$grayLighter: #eee !default; -$white: #fff !default; - - -// Accent colors -// ------------------------- -$blue: #049cdb !default; -$blueDark: #0064cd !default; -$green: #46a546 !default; -$red: #9d261d !default; -$yellow: #ffc40d !default; -$orange: #f89406 !default; -$pink: #c3325f !default; -$purple: #7a43b6 !default; - - -// Scaffolding -// ------------------------- -$bodyBackground: $white !default; -$textColor: $grayDark !default; - - -// Links -// ------------------------- -$linkColor: #08c !default; -$linkColorHover: darken($linkColor, 15%) !default; - - -// Typography -// ------------------------- -$sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default; -$serifFontFamily: Georgia, "Times New Roman", Times, serif !default; -$monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace !default; - -$baseFontSize: 14px !default; -$baseFontFamily: $sansFontFamily !default; -$baseLineHeight: 20px !default; -$altFontFamily: $serifFontFamily !default; - -$headingsFontFamily: inherit; // empty to use BS default, $baseFontFamily -$headingsFontWeight: bold; // instead of browser default, bold -$headingsColor: inherit; // empty to use BS default, $textColor - - -// Component sizing -// ------------------------- -// Based on 14px font-size and 20px line-height - -$fontSizeLarge: $baseFontSize * 1.25; // ~18px -$fontSizeSmall: $baseFontSize * 0.85; // ~12px -$fontSizeMini: $baseFontSize * 0.75; // ~11px - -$paddingLarge: 11px 19px; // 44px -$paddingSmall: 2px 10px; // 26px -$paddingMini: 0 6px; // 22px - -$baseBorderRadius: 4px !default; -$borderRadiusLarge: 6px !default; -$borderRadiusSmall: 3px !default; - - -// Tables -// ------------------------- -$tableBackground: transparent; // overall background-color -$tableBackgroundAccent: #f9f9f9; // for striping -$tableBackgroundHover: #f5f5f5; // for hover -$tableBorder: #ddd; // table and cell border - -// Buttons -// ------------------------- -$btnBackground: $white !default; -$btnBackgroundHighlight: darken($white, 10%) !default; -$btnBorder: #bbb !default; - -$btnPrimaryBackground: $linkColor !default; -$btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 20%) !default; - -$btnInfoBackground: #5bc0de !default; -$btnInfoBackgroundHighlight: #2f96b4 !default; - -$btnSuccessBackground: #62c462 !default; -$btnSuccessBackgroundHighlight: #51a351 !default; - -$btnWarningBackground: lighten($orange, 15%) !default; -$btnWarningBackgroundHighlight: $orange !default; - -$btnDangerBackground: #ee5f5b !default; -$btnDangerBackgroundHighlight: #bd362f !default; - -$btnInverseBackground: #444 !default; -$btnInverseBackgroundHighlight: $grayDarker !default; - - -// Forms -// ------------------------- -$inputBackground: $white !default; -$inputBorder: #ccc !default; -$inputBorderRadius: $baseBorderRadius !default; -$inputDisabledBackground: $grayLighter !default; -$formActionsBackground: #f5f5f5 !default; -$inputHeight: $baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border - - -// Dropdowns -// ------------------------- -$dropdownBackground: $white !default; -$dropdownBorder: rgba(0,0,0,.2) !default; -$dropdownDividerTop: #e5e5e5 !default; -$dropdownDividerBottom: $white !default; - -$dropdownLinkColor: $grayDark !default; -$dropdownLinkColorHover: $white !default; -$dropdownLinkColorActive: $white !default; - -$dropdownLinkBackgroundActive: $linkColor !default; -$dropdownLinkBackgroundHover: $dropdownLinkBackgroundActive !default; - - - -// COMPONENT VARIABLES -// -------------------------------------------------- - - -// Z-index master list -// ------------------------- -// Used for a bird's eye view of components dependent on the z-axis -// Try to avoid customizing these :) -$zindexDropdown: 1000 !default; -$zindexPopover: 1010 !default; -$zindexTooltip: 1030 !default; -$zindexFixedNavbar: 1030 !default; -$zindexModalBackdrop: 1040 !default; -$zindexModal: 1050 !default; - - -// Sprite icons path -// ------------------------- -$iconSpritePath: "glyphicons-halflings.png" !default; -$iconWhiteSpritePath: "glyphicons-halflings-white.png" !default; - - -// Input placeholder text color -// ------------------------- -$placeholderText: $grayLight !default; - - -// Hr border color -// ------------------------- -$hrBorder: $grayLighter !default; - - -// Horizontal forms & lists -// ------------------------- -$horizontalComponentOffset: 180px !default; - - -// Wells -// ------------------------- -$wellBackground: #f5f5f5 !default; - - -// Navbar -// ------------------------- -$navbarCollapseWidth: 979px !default; -$navbarCollapseDesktopWidth: $navbarCollapseWidth + 1 !default; - -$navbarHeight: 40px !default; -$navbarBackgroundHighlight: #ffffff !default; -$navbarBackground: darken($navbarBackgroundHighlight, 5%) !default; -$navbarBorder: darken($navbarBackground, 12%) !default; - -$navbarText: #777 !default; -$navbarLinkColor: #777 !default; -$navbarLinkColorHover: $grayDark !default; -$navbarLinkColorActive: $gray !default; -$navbarLinkBackgroundHover: transparent !default; -$navbarLinkBackgroundActive: darken($navbarBackground, 5%) !default; - -$navbarBrandColor: $navbarLinkColor !default; - -// Inverted navbar -$navbarInverseBackground: #111111 !default; -$navbarInverseBackgroundHighlight: #222222 !default; -$navbarInverseBorder: #252525 !default; - -$navbarInverseText: $grayLight !default; -$navbarInverseLinkColor: $grayLight !default; -$navbarInverseLinkColorHover: $white !default; -$navbarInverseLinkColorActive: $navbarInverseLinkColorHover !default; -$navbarInverseLinkBackgroundHover: transparent !default; -$navbarInverseLinkBackgroundActive: $navbarInverseBackground !default; - -$navbarInverseSearchBackground: lighten($navbarInverseBackground, 25%) !default; -$navbarInverseSearchBackgroundFocus: $white !default; -$navbarInverseSearchBorder: $navbarInverseBackground !default; -$navbarInverseSearchPlaceholderColor: #ccc !default; - -$navbarInverseBrandColor: $navbarInverseLinkColor !default; - - -// Pagination -// ------------------------- -$paginationBackground: #fff !default; -$paginationBorder: #ddd !default; -$paginationActiveBackground: #f5f5f5 !default; - - -// Hero unit -// ------------------------- -$heroUnitBackground: $grayLighter !default; -$heroUnitHeadingColor: inherit !default; -$heroUnitLeadColor: inherit !default; - - -// Form states and alerts -// ------------------------- -$warningText: #c09853 !default; -$warningBackground: #fcf8e3 !default; -$warningBorder: darken(adjust-hue($warningBackground, -10), 3%) !default; - -$errorText: #b94a48 !default; -$errorBackground: #f2dede !default; -$errorBorder: darken(adjust-hue($errorBackground, -10), 3%) !default; - -$successText: #468847 !default; -$successBackground: #dff0d8 !default; -$successBorder: darken(adjust-hue($successBackground, -10), 5%) !default; - -$infoText: #3a87ad !default; -$infoBackground: #d9edf7 !default; -$infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default; - - -// Tooltips and popovers -// ------------------------- -$tooltipColor: #fff !default; -$tooltipBackground: #000 !default; -$tooltipArrowWidth: 5px !default; -$tooltipArrowColor: $tooltipBackground !default; - -$popoverBackground: #fff !default; -$popoverArrowWidth: 10px !default; -$popoverArrowColor: #fff !default; -$popoverTitleBackground: darken($popoverBackground, 3%) !default; - -// Special enhancement for popovers -$popoverArrowOuterWidth: $popoverArrowWidth + 1 !default; -$popoverArrowOuterColor: rgba(0,0,0,.25) !default; - - - -// GRID -// -------------------------------------------------- - - -// Default 940px grid -// ------------------------- -$gridColumns: 12 !default; -$gridColumnWidth: 60px !default; -$gridGutterWidth: 20px !default; -$gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default; - -// 1200px min -$gridColumnWidth1200: 70px !default; -$gridGutterWidth1200: 30px !default; -$gridRowWidth1200: ($gridColumns * $gridColumnWidth1200) + ($gridGutterWidth1200 * ($gridColumns - 1)) !default; - -// 768px-979px -$gridColumnWidth768: 42px !default; -$gridGutterWidth768: 20px !default; -$gridRowWidth768: ($gridColumns * $gridColumnWidth768) + ($gridGutterWidth768 * ($gridColumns - 1)) !default; - - -// Fluid grid -// ------------------------- -$fluidGridColumnWidth: percentage($gridColumnWidth/$gridRowWidth) !default; -$fluidGridGutterWidth: percentage($gridGutterWidth/$gridRowWidth) !default; - -// 1200px min -$fluidGridColumnWidth1200: percentage($gridColumnWidth1200/$gridRowWidth1200) !default; -$fluidGridGutterWidth1200: percentage($gridGutterWidth1200/$gridRowWidth1200) !default; - -// 768px-979px -$fluidGridColumnWidth768: percentage($gridColumnWidth768/$gridRowWidth768) !default; -$fluidGridGutterWidth768: percentage($gridGutterWidth768/$gridRowWidth768) !default; diff --git a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_wells.scss b/yo-demo/ui/app/styles/compass_twitter_bootstrap/_wells.scss deleted file mode 100644 index d80dc44..0000000 --- a/yo-demo/ui/app/styles/compass_twitter_bootstrap/_wells.scss +++ /dev/null @@ -1,29 +0,0 @@ -// -// Wells -// -------------------------------------------------- - - -// Base class -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: $wellBackground; - border: 1px solid darken($wellBackground, 7%); - @include ctb-border-radius($baseBorderRadius); - @include ctb-box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); - blockquote { - border-color: #ddd; - border-color: rgba(0,0,0,.15); - } -} - -// Sizes -.well-large { - padding: 24px; - @include ctb-border-radius($borderRadiusLarge); -} -.well-small { - padding: 9px; - @include ctb-border-radius($borderRadiusSmall); -} diff --git a/yo-demo/ui/app/styles/main.scss b/yo-demo/ui/app/styles/main.scss deleted file mode 100644 index 5532355..0000000 --- a/yo-demo/ui/app/styles/main.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import "compass_twitter_bootstrap"; - -.hero-unit{ - background-color: #FF3333; -} diff --git a/yo-demo/ui/app/styles/main.scss~ b/yo-demo/ui/app/styles/main.scss~ deleted file mode 100644 index 1cbab1e..0000000 --- a/yo-demo/ui/app/styles/main.scss~ +++ /dev/null @@ -1,5 +0,0 @@ -@import "compass_twitter_bootstrap"; - -.hero-unit{ - background-color: #999; -} diff --git a/yo-demo/ui/app/views/main.html b/yo-demo/ui/app/views/main.html index 7fecd66..c09c6e4 100644 --- a/yo-demo/ui/app/views/main.html +++ b/yo-demo/ui/app/views/main.html @@ -6,7 +6,7 @@

    'Allo, 'Allo!

    Always a pleasure scaffolding your apps.

    -

    Splendid!

    +

    Splendid!

    • ♥ from the Yeoman team

    diff --git a/yo-demo/ui/bower.json b/yo-demo/ui/bower.json index f738cff..9383871 100644 --- a/yo-demo/ui/bower.json +++ b/yo-demo/ui/bower.json @@ -1,17 +1,28 @@ { "name": "ui", - "version": "0.0.0", + "version": "1.0.0", "dependencies": { - "angular": "~1.2.28", - "json3": "~3.2.4", - "es5-shim": "~2.0.8", - "angular-resource": "~1.2.28", - "angular-cookies": "~1.2.28", - "angular-sanitize": "~1.2.28", - "angular-route": "~1.2.28" + "angular": "1.4.2", + "bootstrap": "^3.2.0", + "angular-animate": "1.4.2", + "angular-cookies": "1.4.2", + "angular-resource": "1.4.2", + "angular-route": "1.4.2", + "angular-sanitize": "1.4.2", + "angular-touch": "1.4.2" }, "devDependencies": { - "angular-mocks": "~1.2.28", - "angular-scenario": "~1.2.28" + "angular-mocks": "1.4.2" + }, + "appPath": "app", + "moduleName": "angularAppApp", + "overrides": { + "bootstrap": { + "main": [ + "less/bootstrap.less", + "dist/css/bootstrap.css", + "dist/js/bootstrap.js" + ] + } } } diff --git a/yo-demo/ui/karma-e2e.conf.js b/yo-demo/ui/karma-e2e.conf.js deleted file mode 100644 index fa01484..0000000 --- a/yo-demo/ui/karma-e2e.conf.js +++ /dev/null @@ -1,54 +0,0 @@ -// Karma configuration -// http://karma-runner.github.io/0.10/config/configuration-file.html - -module.exports = function(config) { - config.set({ - // base path, that will be used to resolve files and exclude - basePath: '', - - // testing framework to use (jasmine/mocha/qunit/...) - frameworks: ['ng-scenario'], - - // list of files / patterns to load in the browser - files: [ - 'test/e2e/**/*.js' - ], - - // list of files / patterns to exclude - exclude: [], - - // web server port - port: 8080, - - // level of logging - // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: false, - - - // Start these browsers, currently available: - // - Chrome - // - ChromeCanary - // - Firefox - // - Opera - // - Safari (only Mac) - // - PhantomJS - // - IE (only Windows) - browsers: ['Chrome'], - - - // Continuous Integration mode - // if true, it capture browsers, run tests and exit - singleRun: false - - // Uncomment the following lines if you are using grunt's server to run the tests - // proxies: { - // '/': 'http://localhost:9000/' - // }, - // URL root prevent conflicts with the site root - // urlRoot: '_karma_' - }); -}; diff --git a/yo-demo/ui/karma.conf.js b/yo-demo/ui/karma.conf.js deleted file mode 100644 index bc0e168..0000000 --- a/yo-demo/ui/karma.conf.js +++ /dev/null @@ -1,56 +0,0 @@ -// Karma configuration -// http://karma-runner.github.io/0.10/config/configuration-file.html - -module.exports = function(config) { - config.set({ - // base path, that will be used to resolve files and exclude - basePath: '', - - // testing framework to use (jasmine/mocha/qunit/...) - frameworks: ['jasmine'], - - // list of files / patterns to load in the browser - files: [ - 'app/bower_components/angular/angular.js', - 'app/bower_components/angular-mocks/angular-mocks.js', - 'app/bower_components/angular-resource/angular-resource.js', - 'app/bower_components/angular-cookies/angular-cookies.js', - 'app/bower_components/angular-sanitize/angular-sanitize.js', - 'app/bower_components/angular-route/angular-route.js', - 'app/scripts/*.js', - 'app/scripts/**/*.js', - 'test/mock/**/*.js', - 'test/spec/**/*.js' - ], - - // list of files / patterns to exclude - exclude: [], - - // web server port - port: 8080, - - // level of logging - // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: false, - - - // Start these browsers, currently available: - // - Chrome - // - ChromeCanary - // - Firefox - // - Opera - // - Safari (only Mac) - // - PhantomJS - // - IE (only Windows) - browsers: ['Chrome'], - - - // Continuous Integration mode - // if true, it capture browsers, run tests and exit - singleRun: false - }); -}; diff --git a/yo-demo/ui/test/runner.html b/yo-demo/ui/test/runner.html deleted file mode 100644 index f4a00a1..0000000 --- a/yo-demo/ui/test/runner.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - End2end Test Runner - - - - - - \ No newline at end of file diff --git a/yo-demo/ui/test/spec/controllers/main.js b/yo-demo/ui/test/spec/controllers/main.js deleted file mode 100644 index 1f6ae2e..0000000 --- a/yo-demo/ui/test/spec/controllers/main.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict'; - -describe('Controller: MainCtrl', function () { - - // load the controller's module - beforeEach(module('uiApp')); - - var MainCtrl, - scope; - - // Initialize the controller and a mock scope - beforeEach(inject(function ($controller, $rootScope) { - scope = $rootScope.$new(); - MainCtrl = $controller('MainCtrl', { - $scope: scope - }); - })); - - it('should attach a list of awesomeThings to the scope', function () { - expect(scope.awesomeThings.length).toBe(3); - }); -}); diff --git a/yo-demo/ui/test/spec/controllers/myhome.js b/yo-demo/ui/test/spec/controllers/myhome.js deleted file mode 100644 index 8700114..0000000 --- a/yo-demo/ui/test/spec/controllers/myhome.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict'; - -describe('Controller: MyhomeCtrl', function () { - - // load the controller's module - beforeEach(module('uiApp')); - - var MyhomeCtrl, - scope; - - // Initialize the controller and a mock scope - beforeEach(inject(function ($controller, $rootScope) { - scope = $rootScope.$new(); - MyhomeCtrl = $controller('MyhomeCtrl', { - $scope: scope - }); - })); - - it('should attach a list of awesomeThings to the scope', function () { - expect(scope.awesomeThings.length).toBe(3); - }); -}); diff --git a/yo-injection-demo/.gitignore b/yo-injection-demo/.gitignore deleted file mode 100644 index 75cdc27..0000000 --- a/yo-injection-demo/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -logs -project/project -project/target -target -tmp -.history -dist -/.idea -/*.iml -/out -/.idea_modules -/.classpath -/.project -/RUNNING_PID -/.settings -ui/libpeerconnection.log diff --git a/yo-injection-demo/README.md b/yo-injection-demo/README.md deleted file mode 100644 index e0be28e..0000000 --- a/yo-injection-demo/README.md +++ /dev/null @@ -1,30 +0,0 @@ -This application is to demo the different features supported by the plugin using injected routes generator(Play 2.4). - -Start sbt and run the following - - -``` -$ update - -$ npm install - -$ bower install - -$ grunt - -$ run -``` - -This application provides different routes - - -**/oldhome** serves the _default_ play landing page - -**/** redirects to **/ui/** - -**/ui/** serves the _angular application_ - -**/api/somejson?keyword=hello** serves a _json response_ - -**/ui/views/templ.html** serves a template defined in views for which content is passed from the controller - -**/tdemo** serves a dynamic template defined in views for which HTML is passed from the controller - diff --git a/yo-injection-demo/app/controllers/Application.scala b/yo-injection-demo/app/controllers/Application.scala deleted file mode 100644 index 93a7a86..0000000 --- a/yo-injection-demo/app/controllers/Application.scala +++ /dev/null @@ -1,27 +0,0 @@ -package controllers - -import com.tuplejump.playYeoman.Yeoman -import play.api.mvc._ -import play.api.libs.json._ -import play.twirl.api.Html - -class Application extends Controller { - - def index = Action { - Ok(views.html.index("Your new application is ready.")) - } - - def templateDemo = Action { - Ok(views.html.demo("Scala template in Angular") - (Html("
    This is a play scala template in angular views folder which is compiled and used inplace!
    ")) - ) - } - - def json(keyword: String) = Action { - Ok(JsObject("keyword" -> JsString(keyword) :: Nil)) - } - - def serveTemplate = Action { - Ok(views.html.templ("Compiled from a scala template!")) - } -} diff --git a/yo-injection-demo/app/views/index.scala.html b/yo-injection-demo/app/views/index.scala.html deleted file mode 100644 index 1370e0e..0000000 --- a/yo-injection-demo/app/views/index.scala.html +++ /dev/null @@ -1,7 +0,0 @@ -@(message: String) - -@main("Welcome to Play 2.1") { - - @play20.welcome(message) - -} diff --git a/yo-injection-demo/app/views/main.scala.html b/yo-injection-demo/app/views/main.scala.html deleted file mode 100644 index 6c72d80..0000000 --- a/yo-injection-demo/app/views/main.scala.html +++ /dev/null @@ -1,15 +0,0 @@ -@(title: String)(content: Html) - - - - - - @title - - - - - - @content - - diff --git a/yo-injection-demo/build.sbt b/yo-injection-demo/build.sbt deleted file mode 100644 index 0b84fba..0000000 --- a/yo-injection-demo/build.sbt +++ /dev/null @@ -1,13 +0,0 @@ -import com.tuplejump.sbt.yeoman.Yeoman - -name := "yo-injection-demo" - -version := "1.0.0" - -scalaVersion := "2.11.6" - -lazy val root = (project in file(".")).enablePlugins(PlayScala) - -Yeoman.yeomanSettings ++ Yeoman.withTemplates - -routesGenerator := InjectedRoutesGenerator diff --git a/yo-injection-demo/conf/application.conf b/yo-injection-demo/conf/application.conf deleted file mode 100644 index 3f10e05..0000000 --- a/yo-injection-demo/conf/application.conf +++ /dev/null @@ -1,62 +0,0 @@ -# This is the main configuration file for the application. -# ~~~~~ - -# Secret key -# ~~~~~ -# The secret key is used to secure cryptographics functions. -# If you deploy your application to several instances be sure to use the same key! -application.secret=">EokvL1T5mFObV8nUIVoind/u;=j7MI[ofx8nliyDydQs8JH3D6L7NZY=`4tO84p" - -# The application languages -# ~~~~~ -application.langs="en" - -# Global object class -# ~~~~~ -# Define the Global object class for this application. -# Default to Global in the root package. -# application.global=Global - -# Router -# ~~~~~ -# Define the Router object to use for this application. -# This router will be looked up first when the application is starting up, -# so make sure this is the entry point. -# Furthermore, it's assumed your route file is named properly. -# So for an application router like `my.application.Router`, -# you may need to define a router file `conf/my.application.routes`. -# Default to Routes in the root package (and conf/routes) -# application.router=my.application.Routes - -# Database configuration -# ~~~~~ -# You can declare as many datasources as you want. -# By convention, the default datasource is named `default` -# -# db.default.driver=org.h2.Driver -# db.default.url="jdbc:h2:mem:play" -# db.default.user=sa -# db.default.password="" - -# Evolutions -# ~~~~~ -# You can disable evolutions if needed -# evolutionplugin=disabled - -# Logger -# ~~~~~ -# You can also configure logback (http://logback.qos.ch/), by providing a logger.xml file in the conf directory . - -# Root logger: -logger.root=ERROR - -# Logger used by the framework: -logger.play=INFO - -# Logger provided to your application: -logger.application=DEBUG - -yeoman.distDir="/ui/dist" - -yeoman.devDirs=["ui/.tmp", "ui/app"] - diff --git a/yo-injection-demo/conf/routes b/yo-injection-demo/conf/routes deleted file mode 100644 index 61781e7..0000000 --- a/yo-injection-demo/conf/routes +++ /dev/null @@ -1,25 +0,0 @@ -# Routes -# This file defines all application routes (Higher priority routes first) -# ~~~~ - -# OLD HOME PAGE -GET /oldhome @controllers.Application.index - -GET /api/somejson @controllers.Application.json(keyword: String) - - -# Home page -GET / @com.tuplejump.playYeoman.Yeoman.redirectRoot(base="/ui/") - -# Map static resources from the /public folder to the /assets URL path -GET /assets/*file @controllers.Assets.at(path="/public", file) - -GET /ui/views/templ.html @controllers.Application.serveTemplate - -GET /ui @com.tuplejump.playYeoman.Yeoman.index - --> /ui/ yeoman.Routes - -GET /tdemo @controllers.Application.templateDemo - - diff --git a/yo-injection-demo/project/build.properties b/yo-injection-demo/project/build.properties deleted file mode 100644 index a6e117b..0000000 --- a/yo-injection-demo/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=0.13.8 diff --git a/yo-injection-demo/project/plugins.sbt b/yo-injection-demo/project/plugins.sbt deleted file mode 100644 index 565b724..0000000 --- a/yo-injection-demo/project/plugins.sbt +++ /dev/null @@ -1,11 +0,0 @@ -// Comment to get more information during initialization -logLevel := Level.Warn - -// The Typesafe repository -resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" - -// Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0") - -addSbtPlugin("com.tuplejump" % "sbt-yeoman" % "0.8.1") - diff --git a/yo-injection-demo/public/images/favicon.png b/yo-injection-demo/public/images/favicon.png deleted file mode 100644 index c7d92d2ae47434d9a61c90bc205e099b673b9dd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)ezT{T_ZJ?}AL z5NC{NW(ESID=>(O3&Eg8 zmA9J&6c`h4_f6L;=bU>_H8aNG`kfvCj9zomNt)?O;rzWqZs0LEt%1WB218%1fo9uB zsW^yhBR7C(mqN%GEK9&msg0~ zWY?#bf4q8G-~2KttQZ($odJvy&_-~f?9*ThK@fwR$U^1)p*8=_+^3BXx0$i1BC8XC zr21u6D5nVK&^!dOAw&|1E;qC3uFNj3*Jj#&%Oje@0D-nhfmM*o%^5f}-pxQ07(95H z3|LoV>V19w#rLgmRmtVy9!T3M3FUE3><0T8&b3yEsWcLW`0(=1+qsqc(k(ymBLK0h zK!6(6$7MX~M`-QA2$wk7n(7hhkJ}4Rwi-Vd(_ZFX1Yk7TXuB0IJYpo@kLb2G8m)E{ z`9v=!hi}fOytKckfN^C@6+Z*+MVI9-W_p@_3yyR#UYc0FTpD}i#k>c!wYCS)4v@E$ zchZCo=zV@)`v^$;V18ixdjFMY#q^2$wEX%{f(XD8POnsn$bpbClpC@hPxjzyO>pY|*pF3UU2tYcCN?rUk{Sskej70Mmu9vPwMYhO1m{AxAt(zqDT|0jP7FaX=6 V`?~}E4H^Id002ovPDHLkV1hC)G==~G diff --git a/yo-injection-demo/public/javascripts/jquery-1.9.0.min.js b/yo-injection-demo/public/javascripts/jquery-1.9.0.min.js deleted file mode 100644 index 50d1b22..0000000 --- a/yo-injection-demo/public/javascripts/jquery-1.9.0.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license */(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!u||r!==t)return f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof n||"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t||n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]||"none"!==n.style.display||(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]||w(n)||st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?r[i]||"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=un(e,t,o),(0>i||null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+k(e,t,n||(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n||(n=A(e,t),"none"!==n&&n||(cn=(cn||st("