Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit 489f8b7

Browse files
committed
update styles and put up deprecation banner
1 parent 5c9c3cd commit 489f8b7

File tree

12 files changed

+39
-183
lines changed

12 files changed

+39
-183
lines changed

Gemfile.lock

+4-1
Original file line numberDiff line numberDiff line change
@@ -218,5 +218,8 @@ DEPENDENCIES
218218
uglifier (>= 1.3.0)
219219
web-console (~> 2.0)
220220

221+
RUBY VERSION
222+
ruby 2.1.2p95
223+
221224
BUNDLED WITH
222-
1.11.2
225+
1.17.3

app/assets/javascripts/routers/list.js.coffee

+1-17
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ window.demo = {
77
class listApp.Routers.List extends Backbone.Router
88
routes:
99
'(/)' : 'root'
10-
'preview(/)' : 'preview'
1110
'dashboard(/)' : 'lists'
1211
'dashboard/lists(/)' : 'lists'
1312
'dashboard/lists/:id(/)' : 'getList'
@@ -17,19 +16,15 @@ class listApp.Routers.List extends Backbone.Router
1716

1817
initialize: ->
1918
@toggleLoadScreen()
20-
unless $('body').hasClass('pages-home') || $('body').hasClass('pages-preview')
19+
unless $('body').hasClass('pages-home')
2120
@setupSidebar()
2221

2322
getDemoList: ->
2423
listApp.demo = new listApp.Models.DemoList(window.demo)
2524
listApp.view = new listApp.Views.ListsShow({ model: listApp.demo })
2625

27-
preview: ->
28-
@getDemoList()
29-
3026
root: ->
3127
@getDemoList()
32-
@setupDemo(listApp.view.$el)
3328

3429
cleanupLists: ->
3530
if listApp.listView
@@ -77,14 +72,3 @@ class listApp.Routers.List extends Backbone.Router
7772
setupSidebar: ->
7873
listApp.lists ||= new listApp.Collections.Lists()
7974
listApp.listsView = new listApp.Views.StacksShow(collection: listApp.lists)
80-
81-
setupDemo: ($view) ->
82-
$view.on('click', @addActiveClassToDemo)
83-
84-
addActiveClassToDemo: (e) =>
85-
h = $(e.target).closest('#demo').outerHeight()
86-
$(e.target).closest('#demo').addClass('active')
87-
@timer = setTimeout((=> @setMaxHeight()), 1000)
88-
89-
setMaxHeight: ->
90-
$("#demo").addClass('complete')

app/assets/stylesheets/application.css.scss

+8-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,12 @@
2323
@import 'home';
2424
@import 'stacks';
2525
@import 'tasks';
26-
@import 'preview';
2726
@import 'people';
27+
28+
#shutdown-notice {
29+
background: lightsalmon;
30+
color: white;
31+
font-weight: bold;
32+
padding: 16px 32px;
33+
text-align: center;
34+
}

app/assets/stylesheets/globals.css.scss

+2-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ body {
1717
}
1818

1919
html, body {
20-
height: 100%;
20+
min-height: 100vh;
2121
}
2222

2323
h1 {
@@ -46,10 +46,6 @@ button,
4646
float: right;
4747
}
4848

49-
.hero {
50-
background-color: #f6f6f6;
51-
}
52-
5349
.show {
5450
opacity: 1;
5551
transition: opacity 200ms linear;
@@ -205,8 +201,7 @@ textarea {
205201
justify-content: center;
206202
}
207203

208-
.pages-home,
209-
.pages-preview {
204+
.pages-home {
210205
.dots .dot {
211206
background: white;
212207
}

app/assets/stylesheets/home.css.scss

+17-85
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
.pages-home {
2-
background: $primary;
2+
background: #f3f3f4;
3+
display: flex;
4+
flex-direction: column;
5+
}
6+
7+
.hero {
8+
display: flex;
9+
flex-direction: column;
10+
flex: 1 1 auto;
11+
12+
footer {
13+
margin-top: auto;
14+
}
315
}
416

5-
.pages-home, .pages-preview {
17+
.pages-home {
618
#app {
19+
flex: 1 1 auto;
20+
display: flex;
21+
flex-direction: column;
722
position: relative;
823
z-index: 1;
924
padding: 0;
@@ -76,33 +91,6 @@
7691
width: 100%;
7792
}
7893
}
79-
80-
#features {
81-
padding: 35px 0px;
82-
color: #fff;
83-
text-align: left;
84-
85-
li {
86-
float: left;
87-
width: 50%;
88-
padding: 25px 0;
89-
90-
@media only screen and (max-width: $medium-breakpoint) {
91-
width: 100%;
92-
}
93-
94-
h3, p {
95-
padding: 0 30px;
96-
margin: 0px;
97-
line-height: 24px;
98-
font-size: 16px;
99-
}
100-
101-
h3 {
102-
font-weight: 600;
103-
}
104-
}
105-
}
10694
}
10795

10896
footer {
@@ -121,12 +109,6 @@ footer {
121109
text-align: center;
122110
}
123111
}
124-
.right {
125-
@media only screen and (max-width: $medium-breakpoint) {
126-
float: none;
127-
display: block;
128-
}
129-
}
130112
a, a:hover {
131113
color: #525b62;
132114
}
@@ -141,73 +123,23 @@ footer {
141123
#demo {
142124
width: 60%;
143125
padding: 20px 5%;
144-
max-height: 300px;
145126
overflow: hidden;
146-
cursor: pointer;
147-
transition: padding 300ms ease-in-out, max-height 500ms ease-in-out;
148-
transform: translate3d(0,0,0);
149-
perspective: 1000;
150127

151128
@media only screen and (max-width: $medium-breakpoint) {
152129
display: none;
153130
}
154131

155132
.selected-list {
156-
margin: 0 -3px -3px;
157-
transition: margin 300ms ease-in-out;
158133
position: relative;
159134
min-width: 0px;
160135
}
161-
162-
&:hover {
163-
padding-top: 0px;
164-
padding-bottom: 40px;
165-
}
166-
167-
&.active {
168-
cursor: auto;
169-
max-height: 1000px;
170-
padding-top: 0;
171-
padding-bottom: 0;
172-
173-
.selected-list {
174-
margin: 0 -3px 50px;
175-
}
176-
177-
&.complete {
178-
transition: max-height 0s;
179-
max-height: none;
180-
}
181-
}
182136
}
183137
}
184138

185139
.home {
186140
display: none;
187141
}
188142

189-
.pages-preview {
190-
background: #fff;
191-
192-
#demo {
193-
.home {
194-
display: block;
195-
float: left;
196-
}
197-
}
198-
199-
footer {
200-
position: fixed;
201-
bottom: 0;
202-
left: 0;
203-
right: 0;
204-
205-
@media only screen and (max-width: $medium-breakpoint) {
206-
position: relative;
207-
}
208-
}
209-
}
210-
211143
.logo-square {
212144
background: $primary;
213145
border-radius: 3px;

app/assets/stylesheets/preview.css.scss

-17
This file was deleted.

app/controllers/pages_controller.rb

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ class PagesController < ApplicationController
55
def home
66
end
77

8-
def preview
9-
end
10-
118
def dashboard
129
end
1310

app/controllers/stacks_controller.rb

+2-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@ def index
88
end
99

1010
def new
11-
@stack = Stack.new
12-
13-
if @stack.save
14-
redirect_to new_stack_list_path(@stack)
15-
else
16-
redirect_to :root
17-
end
11+
# no longer support list creation
12+
redirect_to :root
1813
end
1914

2015
def show

app/views/layouts/application.html.erb

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
</head>
3030
<body class="<%= body_class.join(" ") %>">
3131

32+
<div id="shutdown-notice">
33+
This version of minimalist will be shutting down on November 2nd, 2020.
34+
</div>
35+
3236
<%#= render "layouts/notifications" %>
3337

3438
<div id="load-screen" class="dots show">

app/views/pages/home.html.erb

+1-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<div class="hero">
2-
32
<section class="wrap">
43
<header>
54
<div class='logo'>
@@ -16,7 +15,6 @@
1615
</h2>
1716
<%= image_tag 'try-me.png', :class => 'try-me' %>
1817
<div class="actions">
19-
<%= link_to "Start a list", new_stack_url, :class => 'btn' %>
2018
<%= link_to user_omniauth_authorize_path(:google_oauth2), class: 'btn btn-primary' do %>
2119
<svg class="icon-google-icon"><use xlink:href="/assets/icons.svg#icon-google-icon"></use></svg>
2220
<span>Sign in with Google</span>
@@ -25,31 +23,8 @@
2523
</div>
2624
</section>
2725
</div>
28-
<div id="features" class="wrap">
29-
<ul class="clearfix">
30-
<li>
31-
<h3>With you everywhere –</h3>
32-
<p>The internet makes your lists magically available anywhere. You can access them on your phone, tablet, or computer.</p>
33-
</li>
34-
<li>
35-
<h3>No need to log-in –</h3>
36-
<p>You don't need an account to use minimalist. Your lists will live at a special url so just bookmark that and you're good to go!</p>
37-
</li>
38-
<li>
39-
<h3>Even better on mobile –</h3>
40-
<p>This was made mobile-first, so although it's not in the App Store it supports touch gestures like swiping, dragging and tapping.</p>
41-
</li>
42-
<li>
43-
<h3>Simple, Shareable –</h3>
44-
<p>Anyone you share your link with can access your lists the same as you. Because some lists are better shared (and some are not).</p>
45-
</li>
46-
</ul>
47-
</div>
4826
<footer>
4927
<div class="wrap clearfix">
50-
<div class="right">
51-
<%= list_total %> Lists. <%= task_total %> Todos.
52-
</div>
53-
© <%= Time.now.year %> Made by <a href='http://twitter.com/mshwery' target="_blank">@mshwery</a>. <a class="twitter icon-twitter" href='http://twitter.com/get_minimalist' title="@get_minimalist" target="_blank"></a>
28+
© <%= Time.now.year %> Made by <a href='http://twitter.com/mshwery' target="_blank">@mshwery</a>.
5429
</div>
5530
</footer>

app/views/pages/preview.html.erb

-18
This file was deleted.

config/routes.rb

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
end
3434
end
3535

36-
get 'preview' => 'pages#preview'
3736
get 'dashboard' => 'pages#dashboard'
3837
get 'dashboard/*all', to: 'pages#dashboard'
3938

0 commit comments

Comments
 (0)