From 2405727d7d62fce31102520167cde42ee688c198 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 24 Sep 2017 11:23:27 -0400 Subject: Started working on UI This commit imports a lot of assets from veekun, as well as a font from http://www.victoryroad.net/showthread.php?t=1507 --- app/assets/stylesheets/pokeviewer/application.css | 15 ---------- .../stylesheets/pokeviewer/application.css.scss | 26 ++++++++++++++++ app/assets/stylesheets/pokeviewer/pokemon.css.scss | 35 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 15 deletions(-) delete mode 100644 app/assets/stylesheets/pokeviewer/application.css create mode 100644 app/assets/stylesheets/pokeviewer/application.css.scss create mode 100644 app/assets/stylesheets/pokeviewer/pokemon.css.scss (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pokeviewer/application.css b/app/assets/stylesheets/pokeviewer/application.css deleted file mode 100644 index 0ebd7fe..0000000 --- a/app/assets/stylesheets/pokeviewer/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/app/assets/stylesheets/pokeviewer/application.css.scss b/app/assets/stylesheets/pokeviewer/application.css.scss new file mode 100644 index 0000000..2d04407 --- /dev/null +++ b/app/assets/stylesheets/pokeviewer/application.css.scss @@ -0,0 +1,26 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require normalize-rails + *= require_self + *= require_tree . + */ + +@font-face { + font-family: 'Power Green'; + src: font-url('PowerGreen.eot'); + src: font-url('PowerGreen.eot?#iefix') format('embedded-opentype'), + font-url('PowerGreen.woff') format('woff'), + font-url('PowerGreen.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} diff --git a/app/assets/stylesheets/pokeviewer/pokemon.css.scss b/app/assets/stylesheets/pokeviewer/pokemon.css.scss new file mode 100644 index 0000000..1f4c068 --- /dev/null +++ b/app/assets/stylesheets/pokeviewer/pokemon.css.scss @@ -0,0 +1,35 @@ +/* + Place all the styles related to the matching controller here. + They will automatically be included in application.css. +*/ + +.pokemon { + font-family: 'Power Green'; + display: flex; + margin: 1em; + + .male { + color: blue; + } + + .female { + color: red; + } + + .pokemon-name { + font-weight: bold; + } + + .pokemon-ivs { + margin: 0 1em; + + th { + text-align: center; + padding-right: .5em; + } + + td { + text-align: right; + } + } +} -- cgit 1.4.1