diff --git a/server/documents/collections/grid.html.eco b/server/documents/collections/grid.html.eco index 72785659f..7c6a18ef1 100755 --- a/server/documents/collections/grid.html.eco +++ b/server/documents/collections/grid.html.eco @@ -33,7 +33,6 @@ themes : ['Default']

A grid is made up of columns of content with gutters to provide negative space between columns.

-

A grid does not necessarily need to specify rows. Content will automatically flow to the next row when all the grid columns are taken in the current row.

All grid systems must assume an arbitrary amount of column rows. Semantic's default theme assumes 16 columns

@@ -41,27 +40,55 @@ themes : ['Default']
-
-
+
-
-
+
-
-
+
-
-
+
-

Grid with Rows

-

A grid can wrap groups of columns into rows

+

Automatic Row Flow

+

A grid does not necessarily need to specify rows. Content will automatically flow to the next row when all the grid columns are taken in the current row.

+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+

Specifying Rows

+

Specifying rows for your grid, allows the bottom and top rows to sit flush with the edge of the grid, and allows you to use row variations

The bottom and top rows, when rows are specified will sit flush with the edge of the grid.

@@ -74,34 +101,27 @@ themes : ['Default']
-
-
+
-
-
+
-
-
+
-
-
+
-
+
-
-
+
-
-
+
-
-
+
@@ -123,28 +143,38 @@ themes : ['Default']
-
-
+
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Types

diff --git a/server/documents/modules/popup.html.eco b/server/documents/modules/popup.html.eco index 96b430f25..27264fc55 100755 --- a/server/documents/modules/popup.html.eco +++ b/server/documents/modules/popup.html.eco @@ -34,14 +34,17 @@ themes : ['Default']

Popup

A standard popup

- - +
+ +

Title

A popup can be formatted with a title

- PonyDog22 + + +
diff --git a/server/documents/views/item.html.eco b/server/documents/views/item.html.eco index 6aaad5cc1..78b15051d 100755 --- a/server/documents/views/item.html.eco +++ b/server/documents/views/item.html.eco @@ -33,80 +33,78 @@ themes : ['Default']

A group of items.

-
- +
+
-
- Arrowhead Valley Camp +
+ 12 Years a Slave
- $1200 - 1 Month + Union Square 14
- This camp in the Hudson Valley is perfect for teenagers from 10-14. + In the pre-Civil War United States, Solomon Northup, a free black man from upstate New York, is abducted and sold into slavery. Facing cruelty as well as unexpected kindnesses Solomon struggles not only to stay alive, but to retain his dignity. In the twelfth year of his unforgettable odyssey, Solomon’s chance meeting with a Canadian abolitionist will forever alter his life.
- - - Child Friendly - +
Sold Out
+
IMAX
+
Additional Languages
- - 0 Spots Available + + Tickets Unavailable
-
- +
+
-
- Buck's Homebrew Stayaway +
+ My Neighbor Totoro
- $1000 - 2 Weeks + IFC Cinema
- This adult stay away from home camp will teach you everything you need to know about forestry and homebrew. + Two sisters move to the country with their father in order to be closer to their hospitalized mother, and discover the surrounding trees are inhabited by Totoros, magical spirits of the forest. When the youngest runs away from home, the older sister seeks help from the spirits to find her.
- - - Adults-Only - +
+ Buy tickets + +
+
Limited
- 2 Spots Available + 10 Seats Avaiable
-
- +
+
-
- Greek Astrology Camp +
+ Watchmen
- $1600 - 6 Weeks + IFC
- Learn astrology the old fashioned way in this stayaway camp for kids aged 8-17. + In a gritty and alternate 1985 the glory days of costumed vigilantes have been brought to a close by a government crackdown, but after one of the masked veterans is brutally murdered an investigation into the killer is initiated. The reunited heroes set out to prevent their own destruction, but in doing so uncover a sinister plot that puts all of humanity in grave danger.
- - - Child Friendly - +
+ Buy tickets + +
- 25 Spots Available + 40 Seats Avaiable
+
@@ -325,36 +323,79 @@ themes : ['Default'] The following example uses ui for legibility only. This is not necessary for using ui items
-
-
-
- Cute Dog +
+
+
+ +
+
+ Arrowhead Valley Camp
- Animals + $1200 + 1 Month
- Click to view more information about this dog at dog.com + This camp in the Hudson Valley is perfect for teenagers from 10-14.
-
- Dog Doggington -
+ + + Child Friendly + + + + 0 Spots Available +
-
-
- Magic Dog +
+
+ +
+
+ Buck's Homebrew Stayaway
- Animals + $1000 + 2 Weeks
- Click to view more information about a magic dog at dog.com + This adult stay away from home camp will teach you everything you need to know about forestry and homebrew.
-
- Dog Doggington -
+ + + Adults-Only + + + + 2 Spots Available + +
+
+
+
+
+ +
+
+ Greek Astrology Camp +
+ $1600 + 6 Weeks +
+
+ Learn astrology the old fashioned way in this stayaway camp for kids aged 8-17. +
+
+ + + Child Friendly + + + + 25 Spots Available +
diff --git a/server/files/images/movies/12years-horizontal.jpg b/server/files/images/movies/12years-horizontal.jpg new file mode 100755 index 000000000..c84b2a87a Binary files /dev/null and b/server/files/images/movies/12years-horizontal.jpg differ diff --git a/server/files/images/movies/12years.jpg b/server/files/images/movies/12years.jpg new file mode 100755 index 000000000..a7689ce15 Binary files /dev/null and b/server/files/images/movies/12years.jpg differ diff --git a/server/files/images/movies/spiderman-horizontal.jpg b/server/files/images/movies/spiderman-horizontal.jpg new file mode 100755 index 000000000..45deff934 Binary files /dev/null and b/server/files/images/movies/spiderman-horizontal.jpg differ diff --git a/server/files/images/movies/spiderman.jpg b/server/files/images/movies/spiderman.jpg new file mode 100755 index 000000000..8b19cc141 Binary files /dev/null and b/server/files/images/movies/spiderman.jpg differ diff --git a/server/files/images/movies/totoro-horizontal.jpg b/server/files/images/movies/totoro-horizontal.jpg new file mode 100755 index 000000000..db2688983 Binary files /dev/null and b/server/files/images/movies/totoro-horizontal.jpg differ diff --git a/server/files/images/movies/totoro.jpg b/server/files/images/movies/totoro.jpg new file mode 100755 index 000000000..db9f1a751 Binary files /dev/null and b/server/files/images/movies/totoro.jpg differ diff --git a/server/files/images/movies/watchmen-horizontal.jpg b/server/files/images/movies/watchmen-horizontal.jpg new file mode 100755 index 000000000..e9e9d8d23 Binary files /dev/null and b/server/files/images/movies/watchmen-horizontal.jpg differ diff --git a/server/files/images/movies/watchmen.jpg b/server/files/images/movies/watchmen.jpg new file mode 100755 index 000000000..aa5f98fd4 Binary files /dev/null and b/server/files/images/movies/watchmen.jpg differ diff --git a/server/files/javascript/semantic.js b/server/files/javascript/semantic.js index cdf05879a..ae170ec14 100755 --- a/server/files/javascript/semantic.js +++ b/server/files/javascript/semantic.js @@ -485,7 +485,7 @@ semantic.ready = function() { editorSession.setUseSoftTabs(true); codeHeight = editorSession.getScreenLength() * editor.renderer.lineHeight + padding; $(this) - // .height(codeHeight + 'px') + .height(codeHeight + 'px') .wrap('
') ; // add label @@ -564,12 +564,12 @@ semantic.ready = function() { }) ; -/* $(window) + $(window) .on('resize', function() { clearTimeout(handler.timer); handler.timer = setTimeout(handler.resizeCode, 500); }) - ;*/ + ; $downloadDropdown .dropdown({ diff --git a/server/files/stylesheets/semantic.css b/server/files/stylesheets/semantic.css index 54923669d..191a32556 100755 --- a/server/files/stylesheets/semantic.css +++ b/server/files/stylesheets/semantic.css @@ -1042,7 +1042,7 @@ body#example.hide { position: relative; background: none; } -#example div.code .ace_scroller { +/*#example div.code .ace_scroller { position: relative; } #example div.code .ace_content { @@ -1051,7 +1051,7 @@ body#example.hide { } #example div.code .ace_layer { position: relative; -} +}*/ #example div.code .ace_gutter, #example div.code .ace_scroller { background-color: transparent; @@ -1240,13 +1240,23 @@ body#example.hide { #example .ui.type.cards .image .grid { -webkit-animation: grid 15s ease infinite; -moz-animation: grid 15s ease infinite; + animation: grid 15s ease infinite; background-color: #F6F6F6; - margin: 0em auto; box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), 0px 1px 2px 0px rgba(0, 0, 0, 0.1) ; } +#example .highlighted.example > .grid { + margin: 0em auto; +} +#example .highlighted.example .grid .grid { + -webkit-animation: none; + -moz-animation: none; + animation: none; + box-shadow: none; + background-color: rgba(0, 0, 0, 0.02); +} #example .highlighted.example .grid .row, #example .ui.type.cards .image .grid .row { border-top: 1px solid #DDDDDD;