diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js
index 008756be0..12651974b 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@@ -30,6 +30,7 @@ export default @injectIntl
class LinkFooter extends React.PureComponent {
static propTypes = {
+ displayMoreLinks : PropTypes.bool,
enableChristmasSnow : PropTypes.bool,
minimumWeekToShowSnow: PropTypes.number,
snowActive : PropTypes.bool,
@@ -41,6 +42,7 @@ class LinkFooter extends React.PureComponent {
intl : PropTypes.object.isRequired,
};
static defaultProps = {
+ displayMoreLinks : false,
enableChristmasSnow : true,
themeIsDark : true,
minimumWeekToShowSnow: 48,
@@ -67,6 +69,7 @@ class LinkFooter extends React.PureComponent {
const shouldWeDisplaySnow = (weekNumber > props.minimumWeekToShowSnow) && props.enableChristmasSnow;
this.state = {
+ displayMoreLinks : false,
enableChristmasSnow: shouldWeDisplaySnow,
theme : props.theme,
};
@@ -85,6 +88,11 @@ class LinkFooter extends React.PureComponent {
}
+ toggleMoreLinks = () => {
+ this.state.displayMoreLinks = !this.state.displayMoreLinks;
+ console.log('this.state.displayMoreLinks', this.state.displayMoreLinks)
+ };
+
toggleSnow = () => {
if (this.state.snow) {
if (this.state.snowActive) {
@@ -130,26 +138,6 @@ class LinkFooter extends React.PureComponent {
- {/*
*/}
-
{this.state.enableChristmasSnow && (
-
+
{invitesEnabled && - ·
}
{withHotkeys && -
·
- ·
- ·
- ·
- ·
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 994cd9b5c..a3a03038d 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -431,7 +431,7 @@
"units.short.million": "{count}M",
"units.short.thousand": "{count}K",
"upload_area.title": "Glissez et déposez pour envoyer",
- "upload_button.label": "Joindre un média ({formats})",
+ "upload_button.label": "Joindre un média, image, vidéo ou audio",
"upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
"upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
"upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
diff --git a/app/javascript/styles/bliss/accounts.scss b/app/javascript/styles/bliss/accounts.scss
index be6356dca..bb8899e32 100644
--- a/app/javascript/styles/bliss/accounts.scss
+++ b/app/javascript/styles/bliss/accounts.scss
@@ -13,7 +13,7 @@
&:active,
&:focus {
.card__bar {
- background: lighten($ui-base-color, 8%);
+ background: lighten($ui-base-color, 4%);
}
}
}
@@ -339,3 +339,14 @@
display: block;
}
}
+.directory__card{
+ .u-photo{
+ max-width: 5em;
+ }
+.directory__card__img{
+ img{
+
+ max-width: 100%;
+ }
+}
+}
diff --git a/app/javascript/styles/bliss/admin.scss b/app/javascript/styles/bliss/admin.scss
index 30673402f..503e3f054 100644
--- a/app/javascript/styles/bliss/admin.scss
+++ b/app/javascript/styles/bliss/admin.scss
@@ -1,6 +1,6 @@
$no-columns-breakpoint: 600px;
-$sidebar-width: 240px;
-$content-width: 840px;
+$sidebar-width: 20vw;
+$content-width: 80vw;
.admin-wrapper {
display: flex;
diff --git a/app/javascript/styles/bliss/basics.scss b/app/javascript/styles/bliss/basics.scss
index b5b5c5f73..473096d6e 100644
--- a/app/javascript/styles/bliss/basics.scss
+++ b/app/javascript/styles/bliss/basics.scss
@@ -207,3 +207,6 @@ button {
.pull-left {
float: left;
}
+.content-heading-actions{
+ @extend .pull-right;
+}
diff --git a/app/javascript/styles/bliss/components.scss b/app/javascript/styles/bliss/components.scss
index 1363b4919..f0adeea78 100644
--- a/app/javascript/styles/bliss/components.scss
+++ b/app/javascript/styles/bliss/components.scss
@@ -52,7 +52,7 @@
&:active,
&:focus,
&:hover {
- background-color: lighten($ui-highlight-color, 10%);
+ background-color: lighten($ui-highlight-color, 4%);
transition: all 200ms ease-out;
}
@@ -6252,3 +6252,8 @@ noscript {
padding: 0.35rem;
}
}
+.status__visibility-icon {
+ float: right;
+ clear: both;
+ margin: 1ch;
+}
diff --git a/app/javascript/styles/bliss/statuses.scss b/app/javascript/styles/bliss/statuses.scss
index 19ce0ab8f..dc7f9e4dc 100644
--- a/app/javascript/styles/bliss/statuses.scss
+++ b/app/javascript/styles/bliss/statuses.scss
@@ -19,55 +19,56 @@
margin: 0;
box-shadow: none;
- .detailed-status,
- .status {
- border-radius: 0 !important;
+ }
+
+ .detailed-status,
+ .status {
+ border-radius: 0 !important;
+
+ img {
+ max-width: 100%;
}
}
+}
- div[data-component] {
- width: 100%;
+div[data-component] {
+ width: 100%;
+}
+
+.entry {
+ background: $ui-base-color;
+
+ .account__avatar {
+ max-width: 5em;
}
- .entry {
- background: $ui-base-color;
+ .detailed-status,
+ .status,
+ .load-more {
+ animation: none;
+ }
+ &:last-child {
.detailed-status,
.status,
.load-more {
- animation: none;
+ border-bottom: 0;
+ border-radius: 0 0 4px 4px;
+ }
+ }
+
+ &:first-child {
+ .detailed-status,
+ .status,
+ .load-more {
+ border-radius: 4px 4px 0 0;
}
&:last-child {
.detailed-status,
.status,
.load-more {
- border-bottom: 0;
- border-radius: 0 0 4px 4px;
- }
- }
-
- &:first-child {
- .detailed-status,
- .status,
- .load-more {
- border-radius: 4px 4px 0 0;
- }
-
- &:last-child {
- .detailed-status,
- .status,
- .load-more {
- border-radius: 4px;
- }
- }
- }
-
- @media screen and (max-width: 740px) {
- .detailed-status,
- .status,
- .load-more {
- border-radius: 0 !important;
+ border-radius: 4px;
}
}
}
@@ -75,8 +76,17 @@
&--highlighted .entry {
background: lighten($ui-base-color, 8%);
}
+
+ @media screen and (max-width: 740px) {
+ .detailed-status,
+ .status,
+ .load-more {
+ border-radius: 0 !important;
+ }
+ }
}
+
.button.logo-button {
flex: 0 auto;
font-size: 14px;
@@ -99,9 +109,8 @@
&:active,
&:focus,
&:hover {
- background: lighten($ui-highlight-color, 10%);
+ background: lighten($ui-highlight-color, 4%);
}
-
&:disabled,
&.disabled {
&:active,
@@ -130,8 +139,13 @@
.public-layout {
.detailed-status {
padding: 15px;
+
+ .account__avatar {
+ max-width: 5em;
+ }
}
+
.status {
padding: 15px 15px 15px (48px + 15px * 2);
min-height: 48px + 2px;
diff --git a/app/models/article.rb b/app/models/article.rb
new file mode 100644
index 000000000..44c4845df
--- /dev/null
+++ b/app/models/article.rb
@@ -0,0 +1,12 @@
+# == Schema Information
+#
+# Table name: articles
+#
+# id :bigint(8) not null, primary key
+# title :string
+# text :text
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+class Article < ApplicationRecord
+end
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index edfb3afd2..f4bd48c46 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -11,8 +11,8 @@
%link{ rel: 'dns-prefetch', href: storage_host }/
= stylesheet_pack_tag 'common', media: 'all'
- -#= stylesheet_pack_tag 'bliss', media: 'all'
- -#= stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
+ = stylesheet_pack_tag 'bliss', media: 'all'
+ = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
= render_initial_state
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 872ffc0f0..25c85abf9 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -6,7 +6,7 @@
%title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
%meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
= stylesheet_pack_tag 'common', media: 'all'
- -#= stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
+ = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag 'error', integrity: true, crossorigin: 'anonymous'
%body.error
diff --git a/db/migrate/20200724140229_create_articles.rb b/db/migrate/20200724140229_create_articles.rb
new file mode 100644
index 000000000..811b24be6
--- /dev/null
+++ b/db/migrate/20200724140229_create_articles.rb
@@ -0,0 +1,10 @@
+class CreateArticles < ActiveRecord::Migration[5.2]
+ def change
+ create_table :articles do |t|
+ t.string :title
+ t.text :text
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5ca037b12..32fbae4a7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_06_28_133322) do
+ActiveRecord::Schema.define(version: 2020_07_24_140229) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -242,6 +242,13 @@ ActiveRecord::Schema.define(version: 2020_06_28_133322) do
t.bigint "status_ids", array: true
end
+ create_table "articles", force: :cascade do |t|
+ t.string "title"
+ t.text "text"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "backups", force: :cascade do |t|
t.bigint "user_id"
t.string "dump_file_name"
diff --git a/spec/fabricators/article_fabricator.rb b/spec/fabricators/article_fabricator.rb
new file mode 100644
index 000000000..b94812f8d
--- /dev/null
+++ b/spec/fabricators/article_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:article) do
+ title "MyString"
+ text "MyText"
+end
\ No newline at end of file
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
new file mode 100644
index 000000000..632e8564f
--- /dev/null
+++ b/spec/models/article_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Article, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end