Skip to content

Commit 62d8b1c

Browse files
kelynchJaymeeH
andauthored
Adding grid with gutters (#1004)
* WIP grid with gutters * modifying the grid system to have a max viewport width of 1440px and min gutters of 120px * first pass at patching errors * rubocop 🚨 * more bug fixing * fixing flash alert bug * updating viewport and gutter width --------- Co-authored-by: HyppoliteJ <[email protected]> Co-authored-by: Jaymee Hyppolite <[email protected]>
1 parent ed63d3a commit 62d8b1c

File tree

4 files changed

+42
-18
lines changed

4 files changed

+42
-18
lines changed

app/assets/stylesheets/_header.scss

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,22 @@
1818
padding-left: 10px;
1919
margin-left: 10px;
2020
}
21-
}
21+
}
22+
.container-fluid {
23+
max-width: 1200px;
24+
margin: 0 auto;
25+
// border: 1px solid #FF0000;
26+
}
27+
28+
.row {
29+
margin-bottom: 4px;
30+
}
31+
32+
.col {
33+
width: 82px;
34+
}
35+
36+
.gutter {
37+
width: 20px;
38+
// border: 1px solid #00FF00;
39+
}

app/views/layouts/application.html.erb

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<% if Rails.env.development? || Rails.env.staging? %>
2929
<%= render 'shared/plausible_dev_staging' %>
30-
<% elsif Rails.env.production? %>
30+
<% elsif Rails.env.production? %>
3131
<%= render 'shared/plausible' %>
3232
<% end %>
3333

@@ -38,18 +38,18 @@
3838
<%= render partial: 'shared/banner' %>
3939
<%= render partial: 'shared/header' %>
4040
<%= render partial: 'shared/emulator' %>
41-
<div class="container">
42-
<% if flash[:alert] %>
43-
<div class="row">
44-
<div class="col">
45-
<div class="alert alert-warning" role="alert" ><%= flash[:alert] %></div>
46-
</div>
47-
</div>
48-
<% end %>
49-
<% if flash[:notice] %>
41+
42+
43+
<div class="container-fluid">
44+
<div class="row">
45+
<div class="col-1 gutter"></div>
46+
47+
<div class="col-10 center-column">
48+
<% if flash[:notice] or flash[:alert] %>
5049
<div class="row">
5150
<div class="col">
5251
<div class="alert alert-primary" role="alert" ><%= flash[:notice] %></div>
52+
<div class="alert alert-warning" role="alert"><%= flash[:alert] %></div>
5353
</div>
5454
</div>
5555
<% end %>
@@ -59,6 +59,11 @@
5959
</div>
6060
</div>
6161
</div>
62+
63+
<div class="col-1 gutter"></div>
64+
</div>
65+
</div>
66+
6267
<%= render partial: 'shared/footer' %>
6368
</body>
6469
</html>

docs/mediaflux_manual_installation.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Notes from first attempt at manual mediaflux installation by Francis Kayiwa, Robert-Anthony Lee-Faison, and Bess Sadler
33

44
### 1. Add the box to active directory
5-
Ask Francis or Alicia how to do this.
5+
Ask Francis or Alicia how to do this.
66
We had to re-name the machines to mflux-staging and mflux-ci to make the names short enough to fit into active directory (string length limit)
77

88
Note that our systems occasionally lose their bind to AD, and this is a known issue. Francis is working on a solution. The workaround right now is to go to AD, delete the object, re-add it, and re-run the ansible playbook.
@@ -15,25 +15,25 @@ Note that when we re-build these boxes we need to keep the mac address the same,
1515

1616
Steps to install on mflux-staging
1717

18-
`dnf search java | grep 1.8`
18+
`dnf search java | grep 1.8`
1919
`sudo dnf install java-1.8.0-openjdk`
2020

2121
### 3. Francis registered a lib-mflux service acccount
22-
This will be used to bind Mediaflux servers to active directory.
22+
This will be used to bind Mediaflux servers to active directory.
2323

2424
Server names:
2525
* mflux-staging
2626
* mflux-ci
2727

2828
### 4. Install Java
29-
Per notes from Robert Knight, Mediaflux production is running Java 1.8.0.412.b08, release 2.el8.
29+
Per notes from Robert Knight, Mediaflux production is running Java 1.8.0.412.b08, release 2.el8.
3030

3131
`sudo dnf install java-1.8.0-openjdk`
3232

3333
### 4. get the installer
3434
```unix
3535
$ sudo dnf install wget
36-
$ wget https://www.arcitecta.com/software/mf/4.16.047/mflux-dev_4.16.047_jvm_1.8.jar
36+
$ wget https://www.arcitecta.com/software/mf/4.16.071/mflux-dev_4.16.071_jvm_1.8.jar
3737
$ sudo java -jar mflux-dev_jvm_1.8.jar nogui
3838
-> accept
3939
-> /opt/mediaflux
@@ -51,7 +51,7 @@ We used default config for the database.
5151

5252
We copied Robert K's systemd file to /etc/systemd/system/mediaflux.service
5353

54-
Francis added a user and a group called mediaflux
54+
Francis added a user and a group called mediaflux
5555

5656
```
5757
$ sudo useradd -r mediaflux
@@ -65,5 +65,5 @@ sudo systemctl enable mediaflux
6565
sudo systemctl start mediaflux
6666
```
6767

68-
Next: open port 80
68+
Next: open port 80
6969
Seems to be running, but can't reach it.

spec/controllers/mediaflux_info_controller_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
let(:user) { FactoryBot.create :user }
66
let(:docker_response) { "{\"vendor\":\"Arcitecta Pty. Ltd.\",\"version\":\"4.16.071\"}" }
77
let(:ansible_response) { "{\"vendor\":\"Arcitecta Pty. Ltd.\",\"version\":\"4.16.047\"}" }
8+
89
before do
910
sign_in user
1011
end

0 commit comments

Comments
 (0)