diff --git a/app/assets/stylesheets/_reset.scss b/app/assets/stylesheets/_reset.scss new file mode 100644 index 0000000..4d1b62f --- /dev/null +++ b/app/assets/stylesheets/_reset.scss @@ -0,0 +1,13 @@ +html, body, h1, h2, h3, h4, h5, h6, p, pre, a, dl, dt, dd, ol, ul, li { + font-size: 100%; + vertical-align: baseline; + background: transparent; + box-sizing: border-box; + overflow: visible; + margin: 0; + padding: 0; +} + +body { + line-height: 1; +} diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss new file mode 100644 index 0000000..03396e2 --- /dev/null +++ b/app/assets/stylesheets/fonts.scss @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Raleway'; + src: url('/fonts/raleway-light.woff') format('woff2'); + font-weight: 300; + font-style: normal; +} + +h1 { + font-family: Raleway, sans-serif; + font-weight: 300; + text-transform: uppercase; +} diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss new file mode 100644 index 0000000..dac2b9b --- /dev/null +++ b/app/assets/stylesheets/layout.scss @@ -0,0 +1,112 @@ +$content-width: 800px; +$content-max-width: 100%; + +body { + font-family: "Open Sans", Helvetica, Arial, sans-serif; + font-weight: 400; +} + +#wrapper { + width: 100%; + text-align: center; + + > header { + margin: 0 auto; + padding: 4rem 0; + text-align: center; + background: #0d4f99; + background: linear-gradient(35deg, #8955a0 0, #0d4f99 100%); + + h1 { + font-size: 1.8rem; + color: #fff; + + span.project-name { + display: none; + // font-size: .5em; + // text-transform: none; + // vertical-align: super; + } + + span.beta { + font-size: .5em; + font-style: italic; + text-transform: none; + vertical-align: super; + } + + span.bolt { + color: #ffd000; + } + } + + p.current-user { + margin-top: 2rem; + color: rgba(255,255,255,0.6); + + strong { + font-weight: 400; + color: #fff; + // color: #ffd000; + // color: #ccff40; + } + } + + a { + color: rgba(255,255,255,0.6); + transition: color 0.1s linear; + + &:hover, &:active { + color: #fff; + } + } + } +} + +.flash-msg { + width: 100%; + text-align: center; + padding: 2rem 0; + + &.notice { + background: #efffc4; + } + + &.alert { + background: #fff4c2; + } +} + +main { + width: $content-width; + max-width: $content-max-width; + margin: 4rem auto; + text-align: left; + + h2, h3 { + margin-bottom: 1.5em; + } + + h2 { + font-size: 1.5rem; + } + + h3 { + font-size: 1.25rem; + } + + p { + line-height: 1.5rem; + margin-bottom: 1rem; + + &.notice { + text-align: center; + } + } + + section { + border-bottom: 1px dotted #ccc; + padding-bottom: 4rem; + margin-bottom: 4rem; + } +} diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss deleted file mode 100644 index 3a356dd..0000000 --- a/app/assets/stylesheets/welcome.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Welcome controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: https://sass-lang.com/ diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index e43169e..70fa703 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -1,9 +1,16 @@ -

Dashboard

-

Ohai.

+
+

Services

+

+ Your Kosmos account and password currently give you access to these + services: +

+
-

Password change

-

- <%= form_with(url: settings_reset_password_path, method: :post) do %> - <%= submit_tag("Send me a password reset link") %> - <% end %> -

+
+

Password change

+

+ <%= form_with(url: settings_reset_password_path, method: :post) do %> + <%= submit_tag("Send me a password reset link") %> + <% end %> +

+
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index b4ccd6a..ed6d7ce 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -6,14 +6,14 @@

<%= f.label :cn, 'User' %>
- <%= f.text_field :cn, autofocus: true, autocomplete: "username" %> @ kosmos.org + <%= f.text_field :cn, autofocus: true, autocomplete: "username", required: true %> @ kosmos.org

<%= f.label :email, 'Email address' %>
- <%= f.email_field :email, autocomplete: "email" %> + <%= f.email_field :email, autocomplete: "email", required: true %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 29e9bd3..b9aa28c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,25 +5,37 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> -

Kosmos Accounts

- <% if user_signed_in? %> -

- Signed in as <%= current_user.cn %>@kosmos.org. - <%= link_to "Log out", destroy_user_session_path, method: :delete %> -

- <% end %> +
+
+

+ Kosmos + Akkounts + beta +

+ <% if user_signed_in? %> +

+ Signed in as <%= current_user.cn %>@kosmos.org. + <%= link_to "Log out", destroy_user_session_path, method: :delete %> +

+ <% end %> +
- <% flash.each do |type, msg| %> -
-

<%= msg %>

-
- <% end %> + <% flash.each do |type, msg| %> +
+

<%= msg %>

+
+ <% end %> - <%= yield %> +
+ <%= yield %> +
+
diff --git a/app/views/welcome/check_your_email.html.erb b/app/views/welcome/check_your_email.html.erb index 77c0c9f..471a9d9 100644 --- a/app/views/welcome/check_your_email.html.erb +++ b/app/views/welcome/check_your_email.html.erb @@ -1,3 +1,3 @@ -

+

You can close this window or tab now.

diff --git a/public/fonts/raleway-light.woff b/public/fonts/raleway-light.woff new file mode 100644 index 0000000..70b55b5 Binary files /dev/null and b/public/fonts/raleway-light.woff differ diff --git a/public/fonts/raleway-thin.woff b/public/fonts/raleway-thin.woff new file mode 100644 index 0000000..f18d0ee Binary files /dev/null and b/public/fonts/raleway-thin.woff differ diff --git a/public/fonts/raleway-thin.woff2 b/public/fonts/raleway-thin.woff2 new file mode 100644 index 0000000..656b10e Binary files /dev/null and b/public/fonts/raleway-thin.woff2 differ