ubiquity-slideshow team mailing list archive
-
ubiquity-slideshow team
-
Mailing list archive
-
Message #03001
[Merge] lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-mate-focal into lp:ubiquity-slideshow-ubuntu
Martin Wimpress has proposed merging lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-mate-focal into lp:ubiquity-slideshow-ubuntu.
Requested reviews:
Ubiquity Slideshow (ubiquity-slideshow)
For more details, see:
https://code.launchpad.net/~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-mate-focal/+merge/380605
This merge proposal add a new design for Ubuntu MATE slideshow and updates the screenshots. No language strings have been changed.
--
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-mate-focal into lp:ubiquity-slideshow-ubuntu.
=== modified file 'slideshows/ubuntu-mate/slides/01_welcome.html'
--- slideshows/ubuntu-mate/slides/01_welcome.html 2017-08-23 22:42:54 +0000
+++ slideshows/ubuntu-mate/slides/01_welcome.html 2020-03-12 01:37:20 +0000
@@ -1,12 +1,8 @@
-<div class="header">
- <h1 class="slidetitle">Welcome to Ubuntu MATE</h1>
-</div>
-<div class="main wide">
- <div class="text">
- <div>
+<div class="wide">
+ <div class="welcome">
+ <h1>Welcome to Ubuntu MATE</h1>
<p>A community developed Ubuntu based operating system that
beautifully integrates the MATE desktop.</p>
- </div>
- </div>
- <img class="background" src="screenshots/01_welcome.png" />
-</div>
\ No newline at end of file
+ </div>
+ <div class="whitebar"><!-- css background image here --></div>
+</div>
=== modified file 'slideshows/ubuntu-mate/slides/02_about.html'
--- slideshows/ubuntu-mate/slides/02_about.html 2018-09-27 19:09:45 +0000
+++ slideshows/ubuntu-mate/slides/02_about.html 2020-03-12 01:37:20 +0000
@@ -7,10 +7,13 @@
<p>Ubuntu MATE is a stable, easy-to-use operating system with a
configurable desktop environment. Ideal for those who want the
most out of their computers and prefer a traditional desktop
- metaphor. With modest hardware requirements it is suitable for
+ metaphor. <br />
+ With modest hardware requirements it is suitable for
modern workstations, single board computers and older hardware
- alike.</p>
- <br />
+ alike.
+ </p>
+ </div>
+ <div>
<p>For users coming from other operating systems, Ubuntu MATE can
adapt the user interface with one-click to something more modern
or something that you might be more familiar with via
@@ -18,4 +21,4 @@
</div>
</div>
<img class="screenshot" src="screenshots/02_about.png"/>
-</div>
\ No newline at end of file
+</div>
=== modified file 'slideshows/ubuntu-mate/slides/icons/firefox.png'
Binary files slideshows/ubuntu-mate/slides/icons/firefox.png 2018-08-13 19:41:51 +0000 and slideshows/ubuntu-mate/slides/icons/firefox.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/icons/welcome.png'
Binary files slideshows/ubuntu-mate/slides/icons/welcome.png 2016-01-10 15:19:40 +0000 and slideshows/ubuntu-mate/slides/icons/welcome.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/link/base.css'
--- slideshows/ubuntu-mate/slides/link/base.css 2017-08-23 22:42:54 +0000
+++ slideshows/ubuntu-mate/slides/link/base.css 2020-03-12 01:37:20 +0000
@@ -27,15 +27,11 @@
html, body {
margin:0;
padding:0;
-
- background-color:#F7F6F6;
-
font-family:'Ubuntu', 'UbuntuBeta', sans-serif;
font-size:12px;
line-height:1.4em;
-
- color:#333333;
-
+ color: #ffffff;
+
/* no reason to expose this extra stuff to the user */
-webkit-user-select:none;
-moz-user-select:none;
@@ -47,7 +43,7 @@
Hyperlink-style text
*/
a {
- color:#87a556;
+ color: #ffffff;
text-decoration:none;
display:inline;
}
@@ -62,13 +58,14 @@
#wrapper {
position:absolute;
-
+
width:752px;
height:100%;
}
#slideshow {
- background-image:url('background2.png');
+ background: #3a4724 radial-gradient( circle farthest-corner at 20% -120%, #3a4724 0%, #a3ba79 90% );
+ background-image:url('bg.jpg');
width:752px;
min-height:442px;
height:100%;
@@ -83,12 +80,12 @@
.control-arrow {
display:block;
position:absolute;
-
+
z-index:100;
top:218px;
height:64px;
width:33px;
-
+
background-repeat:no-repeat;
cursor:pointer;
}
@@ -120,18 +117,19 @@
top:0px;
width:100%;
height:68px;
- background-color:#3C3B37;
+ /* background-color:#3C3B37;
+ background-image:url('background2.png'); */
}
.header > .slidetitle {
display:table-cell;
padding:0px 25px;
vertical-align:middle;
-
+
font-size:24px;
line-height:30px;
font-weight:normal;
- color:#DED9CB;
+ color:#f8f8f8;
}
.header > .slidetitle img {
display: block;
@@ -139,18 +137,18 @@
.main {
position:absolute;
- top:70px; /* 68px + 2px margin */
+ top:50px; /* 68px + 2px margin */
bottom:2px;
left:2px;
right:2px;
min-height:370px; /* 442px (from #slideshow) - 70px - 2px */
-
+
/* move this to #slideshow if we don't want the background image to move with slides */
/* background-image:url('background2.png');*/
}
.main.wide {
- top:68px;
+ top:48px;
left:0px;
right:0px;
bottom:0px;
@@ -161,12 +159,54 @@
A slide's body text goes inside here.
Inner space is 224px wide.
*/
+
+.welcome {
+ position:absolute;
+ z-index:10;
+ top: 40px;
+ left: 40px;
+ width: 700px;
+ overflow:auto;
+
+}
+.welcome > p {
+ background:none;
+ font-size:16px;
+ width: 400px;
+ line-height:1.5em;
+ font-family: 'ubuntu';
+}
+
+.whitebar {
+ height: 108px;
+ margin-top: 200px;
+ background: #ffffff;
+ width:100%;
+ background-repeat: no-repeat;
+ background-position: center;
+ background-image: url('welcome_logos.jpg');
+ }
+
+
+h1 {
+ clear: both;
+
+ font-size: 240%;
+ font-weight: normal;
+ line-height: 1.3em;
+
+ box-sizing: border-box;
+ margin-bottom: 1em;
+}
+
+
+
.main > .text {
position:absolute;
z-index:10;
top:25px;
- right:36px;
- width:248px;
+ right: 36px;
+ width:250px;
bottom:35px;
min-height:329px; /* 369 - 25 - 15 (for bottom) */
overflow:auto;
@@ -175,7 +215,8 @@
.text > div {
margin-bottom:8px;
padding:6px 12px;
- /* background-color:#F7F6F6; */
+ background-color: rgba(0, 0, 0, 0.35);
+ border-radius: 4px;
}
.text > div:last-child {
margin-bottom:0px;
@@ -187,7 +228,7 @@
font-size:inherit;
font-weight:normal;
text-decoration:none;
- border-bottom:#333333 dotted 1px;
+ border-bottom:#87a556 dotted 1px;
}
.main.wide > .text {
@@ -195,13 +236,7 @@
width:650px;
}
-.main.wide > .text > div {
- background:none;
- font-size:24px;
- line-height:1.5em;
- color:#F7F6F6;
- text-shadow:2px 2px 4px #333333;
-}
+
.featured ul {
display:table;
@@ -234,124 +269,26 @@
position:absolute;
top:25px;
left:-2px; /* offsets 2px margin of .main */
-
z-index:2;
-
- -webkit-box-shadow:#999999 0px 0px 5px;
- -moz-box-shadow:#999999 0px 0px 5px;
- box-shadow:#999999 0px 0px 5px;
-}
-
-/* Expects screenshot to be 748x370 px */
-.main.wide > .background {
- top:0px;
- right:0px;
- width:100%;
- height:auto;
- -webkit-box-shadow:none;
- -moz-box-shadow:none;
- box-shadow:none;
-
- z-index:0;
-}
+}
+
+
.main.wide > .twitter-stream {
display:none; /* always revealed by javascript */
-
+
position:absolute;
width:334px;
height:304px; /* 304 - 22 (for .twitter-stream-input) */
top:25px;
right:16px;
z-index:2;
-
+
padding:0 6px;
-
+
color:#eee;
}
-.twitter-stream .twitter-stream-header {
- display:block;
- padding:6px 2px 0px 2px;
-}
-.twitter-stream .twitter-stream-header h2 {
- display:inline;
- color:#fff;
-
- font-size:16px;
-}
-.twitter-stream .twitter-stream-header img {
- opacity:0.6;
- float:right;
-
- margin-left:22px;
-
- -webkit-transition:opacity 150ms linear;
-}
-.twitter-stream .twitter-stream-header:hover img {
- opacity:0.8;
-}
-
-.twitter-stream .twitter-stream-tweets {
- overflow:hidden;
-
- height:100%;
-
- /* Warning: this is non-standard, only works in Webkit, could break at any time */
- -webkit-mask-image:-webkit-linear-gradient(top, rgba(0,0,0,1) 0%, rgba(0,0,0,1) 70%, rgba(0,0,0,0) 100%);
-}
-
-.twitter-stream .tweet {
- padding:6px 2px;
- border-bottom:1px dotted rgba(255, 255, 255, 0.2);
-}
-.tweet .tweet-avatar {
- display:table-cell;
- vertical-align:top;
- padding:0 6px;
-}
-
-.tweet .tweet-author-details {
- display:inline-block;
-}
-
-.tweet .tweet-author-name {
- color:#fff;
- font-weight:bold;
-}
-.tweet .tweet-author-id {
- color:#bbb;
- font-weight:normal;
- margin-left:1em;
- font-size:0.9em;
-}
-
-.tweet .tweet-text {
- display:block;
-}
-
-.tweet .tweet-text a {
- color:#bbb;
-}
-
-.twitter-stream input.twitter-stream-input {
- width:100%;
-
- -webkit-box-sizing:border-box;
- padding:4px 2px 4px 22px;
-
- background-color:rgba(0, 0, 0, 0);
- border:none;
- outline:none;
- color:#fff;
-
- background-image:url('twitter-bird-16.png');
- background-position:left center;
- background-repeat:no-repeat;
-}
-.twitter-stream input.twitter-stream-input:focus {
- background-color:rgba(0, 0, 0, 0.1);
-}
/*
This rule disables drag-and-drop for images. See bug #448703.
@@ -410,4 +347,3 @@
.l10n-string {
display:none;
}
-
=== added file 'slideshows/ubuntu-mate/slides/link/bg.jpg'
Binary files slideshows/ubuntu-mate/slides/link/bg.jpg 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/link/bg.jpg 2020-03-12 01:37:20 +0000 differ
=== added file 'slideshows/ubuntu-mate/slides/link/welcome_logos.jpg'
Binary files slideshows/ubuntu-mate/slides/link/welcome_logos.jpg 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/link/welcome_logos.jpg 2020-03-12 01:37:20 +0000 differ
=== removed file 'slideshows/ubuntu-mate/slides/screenshots/01_welcome.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/01_welcome.png 2017-08-23 22:42:54 +0000 and slideshows/ubuntu-mate/slides/screenshots/01_welcome.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/02_about.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/02_about.png 2017-08-23 22:42:54 +0000 and slideshows/ubuntu-mate/slides/screenshots/02_about.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/03_getting_started.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/03_getting_started.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/03_getting_started.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/04_software.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/04_software.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/04_software.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/05_tweak.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/05_tweak.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/05_tweak.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/06_browse.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/06_browse.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/06_browse.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/07_games.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/07_games.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/07_games.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/08_music.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/08_music.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/08_music.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/09_photos.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/09_photos.png 2017-08-23 22:42:54 +0000 and slideshows/ubuntu-mate/slides/screenshots/09_photos.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/10_video.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/10_video.png 2019-09-28 11:30:41 +0000 and slideshows/ubuntu-mate/slides/screenshots/10_video.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/12_accessibility.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/12_accessibility.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/12_accessibility.png 2020-03-12 01:37:20 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/13_community.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/13_community.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/13_community.png 2020-03-12 01:37:20 +0000 differ
