Skip to content

Commit f59b5d9

Browse files
Redesign program page
Redesign website program page This will align the program page with Gina Valdez's wire-framed design. This page will need a little more work specifically to add the following - A filter to allow a site user to narrow down the talks that appear - Keynotes need to separated in the CFP application - And the individual program card is going to be getting a better look and feel adjust subnav controller to use dataset This adjustment is necessary to allow the sub_nav controller to be used in the TinyMCE code editor * update spec with new container naming convention * WIP finalize program page design * 2nd pass on program page design This commit is largely done just update the layout of the program page. Certain elements are largely still in flux, and will most likely change in the upcoming commits. Stay tuned. * configure session formats displayed on program page allow a website creator/organizer to configure exactly which session formats will be displayed on the website page. Also allow creator to set position, and display name of the session formats. The primary reason for doing this is to allow keynotes, talks, workshops, and any future session format to be properly displayed on the website program page. The website configuration form still needs some work, rendering the form groups inline is difficult becuase simple form doesn't easily allow wrapper_html to be placed around inputs generated with simple_fields_for * final pass at program page design Uses the website decoarator to generalize tag/session format background colors. This will mean tracks color/classes wont need to be updated year over year * adjustments made per code review * update specs to consider session format configuration Use the program session factories to create both the session_formats and the session_format_configs
1 parent 2e920a2 commit f59b5d9

File tree

22 files changed

+393
-315
lines changed

22 files changed

+393
-315
lines changed
291 Bytes
Loading
343 Bytes
Loading

app/assets/stylesheets/themes/default/application.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ body {
3434
}
3535

3636
.hidden {
37-
display: none;
37+
display: none!important;
3838
}
3939

4040
header + #content {
Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,56 @@
1-
21
$black: #000000 !default;
3-
$bronze: #B77D39 !default;
2+
$blue: #3444DA !default;
3+
$blue-dark: #417D7A !default;
4+
$blue-light: #A1E3D8 !default;
45
$divider: #E0D2C7 !default;
5-
$divider-light: rgba(0, 0, 0, .1) !default;
6+
$divider-light: #EBEBEB !default;
7+
$bronze: #B77D39 !default;
8+
$brown: #5A5655 !default;
69
$gold: #FFB62C !default;
10+
$green: #829757 !default;
11+
$green-dark: #417D7A !default;
712
$grey: #494644 !default;
813
$grey-light: #C4C4C4 !default;
914
$grey-lighter: #F5F5F5 !default;
1015
$grey-lightest: #E7E7E7 !default;
1116
$grey-logo: #E6E6E6 !default;
17+
$orange: #FFBC90 !default;
18+
$orange-burnt: #EA652C !default;
19+
$pastel-pink: #F94975 !default;
20+
$pastel-purple: #CD8DF4 !default;
21+
$pastel-peach: #FFBC80 !default;
22+
$pastel-blue-light: #A1E3D8 !default;
23+
$pastel-blue: #3444DA !default;
24+
$pink: #FF88ab !default;
1225
$platinum: #C7D7D7 !default;
26+
$purple: #7445C0 !default;
1327
$red: #C04F45 !default;
28+
$red-dark: #E14943 !default;
29+
$red-light: #E14943 !default;
1430
$silver:#E0E0E0 !default;
31+
$teal: #48c892 !default;
1532
$text: $grey !default;
33+
$text-secondary: #515151 !default;
34+
$yellow: #FFD801 !default;
1635
$white: #FFFFFF !default;
36+
37+
// Session Formats
38+
$session-format-tag-1: $pastel-pink !default;
39+
$session-format-tag-2: $pastel-purple !default;
40+
$session-format-tag-3: $pastel-peach !default;
41+
$session-format-tag-4: $pastel-blue-light !default;
42+
$session-format-tag-5: $pastel-blue !default;
43+
44+
// Track Tags
45+
$bg-track-1: $yellow!default;
46+
$bg-track-2: $orange-burnt !default;
47+
$bg-track-3: $pink !default;
48+
$bg-track-4: $purple !default;
49+
$bg-track-5: $blue-dark !default;
50+
$bg-track-6: $teal !default;
51+
$bg-track-7: $red-dark !default;
52+
$bg-track-8: $brown !default;
53+
$bg-track-9: $silver !default;
54+
$bg-track-10: $blue-light !default;
55+
$bg-track-11: $bronze !default;
56+
$bg-track-12: $orange !default;

0 commit comments

Comments
 (0)