diff --git a/.gitignore b/.gitignore index 3fbc415..dc71293 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ # Ignore changes on the application config. /config/gitlab.yml +/config/application.rb Gemfile.lock /public/ diff --git a/app/assets/images/newton.png b/app/assets/images/newton.png index 23adb42..e066890 100644 Binary files a/app/assets/images/newton.png and b/app/assets/images/newton.png differ diff --git a/app/assets/images/stallman.png b/app/assets/images/stallman.png index 0936832..e317e56 100644 Binary files a/app/assets/images/stallman.png and b/app/assets/images/stallman.png differ diff --git a/app/assets/javascripts/parallax.coffee b/app/assets/javascripts/parallax.coffee index 05a10b7..6ad312b 100644 --- a/app/assets/javascripts/parallax.coffee +++ b/app/assets/javascripts/parallax.coffee @@ -39,9 +39,12 @@ App.scroll = -> bg_pos = -((v_scroll-(section*$(window).innerHeight()))/2) section_element = $($(".section")[section]) if section_element and section_element.css("background-image") != "none" + content = section_element.find(".content") + content.css("display", "none") section_element.css( "background-position", "center " + bg_pos + "px") + content.css("display", "block") $(document).on "page:change", -> App.init() diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss index 0207c87..1837d28 100644 --- a/app/assets/stylesheets/welcome.scss +++ b/app/assets/stylesheets/welcome.scss @@ -123,21 +123,23 @@ p { width: 100%; height: 100%; } -#section1 .content ,#section3, .content, #section5 .content { +#section1 .content, #section3 .content, #section5 .content { color: rgb(214,206,204); - background-position: center top; } #section2, #section4, #section6 { background-color: rgb(255,255,255); } #section1 { background: image_url("resized/blown.jpg") fixed; + background-position: center top; } #section3 { background: image_url("resized/beach3.jpg") fixed; + background-position: center top; } #section5 { background: image_url("resized/robin.jpg") fixed; + background-position: center top; } #footer { @@ -172,17 +174,19 @@ p { overflow: hidden; box-shadow: 10px 10px 10px rgba(0,0,0,0.7); } -#weird { +#weird, #web { position: relative; width: 70%; left: 50%; top: 50%; transform: translate(-50%, -50%); } -#weird .textbox { +#weird .textbox, #web .textbox { + padding: 10px; overflow: hidden; box-shadow: 10px 10px 10px rgba(0,0,0,0.7); text-align: justify; + width: 100%; } .textbox { @@ -218,7 +222,7 @@ p { } .section .watermark { position: absolute; - opacity: 0.08; + opacity: 0.02; width: 60%; top: 50%; left: 50%; @@ -298,10 +302,10 @@ p { .dictionary { position: relative; - width: 70%; + width: 60%; left: 50%; transform: translate(-50%, 0); - font-size: small; + font-size: x-small; } .dictionary .headword { display: inline-block; @@ -333,6 +337,10 @@ p { text-decoration: underline; font-family: serif; } +.dictionary ol.fifth { + counter-reset: section 4; + list-style-type: none; +} .dictionary ol { counter-reset: section; list-style-type: none; diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index e7b3d5a..43f1c9a 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -77,7 +77,6 @@

WEIRD

-
weird adj.
/'wɪəd/
@@ -101,14 +100,13 @@ the Fates. + Taken from + "The free dictionary" + Phonetics from + + PhoTransEdit +
-
- Taken from - "The free dictionary" - Phonetics from - - PhoTransEdit -
@@ -140,37 +138,25 @@
-
+

WEB

-
web n.
/web/
-
    +
    1.  
      1. - A woven fabric, especially one on a loom or just removed from - it. + A woven fabric, especially one on a loom or just removed + from it.
      2. The structural part of cloth.
    2. -
    3. - A latticed or woven structure: - - A web of palm branches formed the roof of the hut. - -
    4. -
    5. - A structure of delicate, threadlike filaments characteristically - spun by spiders or certain insect larvae. -
    6. -
    7. - Something intricately contrived, especially something that ensnares - or entangles: caught in a web of lies. -
    8. +
    +

    +
    1. A complex, interconnected structure or arrangement: a web of telephone wires. @@ -178,49 +164,15 @@
    2. often Web The World Wide Web.
    3. -
    4. - A radio or television network. -
    5. -
    6. - A membrane or fold of skin connecting the toes, as of certain - amphibians, birds, and mammals. -
    7. -
    8. - The barbs on each side of the shaft of a bird's feather; a vane. -
    9. -
    10. - Baseball A piece of leather or - leather mesh that fills the space between the thumb and forefinger - of a baseball glove. Also called - trap, - webbing. -
    11. -
    12. - Architecture A space or compartment - between the ribs or groins of a vault. Also called - cell. -
    13. -
    14. - A metal sheet or plate connecting the heavier sections, ribs, or - flanges of a structural element. -
    15. -
    16. - A thin metal plate or strip, as the bit of a key or the blade of a - saw. -
    17. -
    18. - A large continuous roll of paper, such as newsprint, either in the - process of manufacture or as it is fed into a web press. -
    +

    + Taken from + "The free dictionary" + Phonetics from + + PhoTransEdit +
-
- Taken from - "The free dictionary" - Phonetics from - - PhoTransEdit -