Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

removed marketplace-experiments (as well as bootstrap submodule)

  • Loading branch information...
commit d08960809768f9f88a03fea1425023e8043aff34 1 parent a0ec113
@potch potch authored
Showing with 0 additions and 1,336 deletions.
  1. +0 −3  .gitmodules
  2. +0 −1  media/marketplace-experiments/bootstrap
  3. +0 −27 media/marketplace-experiments/css/buttons.less
  4. +0 −95 media/marketplace-experiments/css/detail.less
  5. +0 −164 media/marketplace-experiments/css/frameless.less
  6. +0 −18 media/marketplace-experiments/css/header.less
  7. +0 −142 media/marketplace-experiments/css/lib.less
  8. +0 −530 media/marketplace-experiments/css/reset.less
  9. +0 −70 media/marketplace-experiments/css/site.less
  10. +0 −42 media/marketplace-experiments/css/slider.less
  11. BIN  media/marketplace-experiments/gridbg-even.png
  12. BIN  media/marketplace-experiments/gridbg.png
  13. +0 −12 mkt/asset_bundles.py
  14. 0  mkt/experiments/__init__.py
  15. +0 −3  mkt/experiments/context_processors.py
  16. +0 −11 mkt/experiments/urls.py
  17. +0 −24 mkt/experiments/views.py
  18. +0 −4 mkt/settings.py
  19. +0 −1  mkt/templates/mkt/home.html
  20. +0 −8 mkt/urls.py
  21. +0 −113 templates/marketplace-experiments/base.html
  22. +0 −56 templates/marketplace-experiments/detail.html
  23. +0 −3  templates/marketplace-experiments/fragment.html
  24. +0 −8 templates/marketplace-experiments/header.html
  25. +0 −1  templates/marketplace-experiments/home.html
View
3  .gitmodules
@@ -13,6 +13,3 @@
[submodule "vendor"]
path = vendor
url = git://github.com/mozilla/zamboni-lib.git
-[submodule "media/marketplace-experiments/bootstrap"]
- path = media/marketplace-experiments/bootstrap
- url = git://github.com/mozilla/bootstrap.git
1  media/marketplace-experiments/bootstrap
@@ -1 +0,0 @@
-Subproject commit 7e13213ae8ed862cd3454fb6eee8efac9450ccb1
View
27 media/marketplace-experiments/css/buttons.less
@@ -1,27 +0,0 @@
-@import 'lib';
-
-.button, button, input[type=submit] {
- display: inline-block;
- padding: 4px 8px;
-
- cursor: pointer;
-
- .border-radius(4px);
- border: 1px solid @darkgray;
- background: @gray;
-
- color: #fff;
- text-decoration: none;
- text-align: center;
-
- &.prominent {
- font-weight: bold;
- }
- &.large {
- padding: 8px 12px;
- }
- &.install {
- background: @green;
- border-color: darken(@green, 50%);
- }
-}
View
95 media/marketplace-experiments/css/detail.less
@@ -1,95 +0,0 @@
-@import 'lib';
-
-.product-details {
- padding: 1em 0;
- .app-icon {
- .width(2);
- float:left;
- img {
- max-width: 100%;
- }
- }
- .vitals {
- .width(6);
- float: left;
- }
- .actions {
- float: right;
- text-align: right;
- .width(2);
- }
- .app-info {
- float: right;
- .width(8);
- }
- .compatibility {
- .width(2);
- float: left;
- }
- .description {
- clear: both;
- }
-}
-
-// 7 columns
-@media (max-width: @7col) {
- .product-details {
- .app-icon,
- .compatibility {
- .width(2);
- }
- .app-info {
- .width(5);
- }
- }
-}
-
-//4 columns
-@media (max-width: @4col) {
- .product-details {
- .vitals {
- float: none;
- width: auto;
- }
- .app-icon {
- .width(1);
- }
- .app-info {
- .width(4);
- float: none;
- }
- .ratings {
- float: left;
- }
- .actions {
- float: right;
- width: auto;
- }
- }
-}
-
-// 3 columns
-@media (max-width: @3col) {
- .product-details {
- .app-icon {
- .width(1);
- float: left;
- margin: 0 1em 1em 0;
- }
- .ratings {
- float: none;
- }
- .app-info {
- .width(3);
- float: none;
- }
- .actions {
- float: none;
- }
- .actions .button {
- .border-box;
- width: 100%;
- margin-bottom: 8px;
- }
- }
-}
View
164 media/marketplace-experiments/css/frameless.less
@@ -1,164 +0,0 @@
-/*
- Frameless <http://framelessgrid.com/>
- by Joni Korpi <http://jonikorpi.com/>
- licensed under CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
-*/
-
-
-//
-// Configuration
-//
-
-@font-size: 16; // Your base font-size in pixels
-@em: @font-size*1em; // Shorthand for outputting ems, e.g. "12/@em"
-
-@column: 48; // The column-width of your grid in pixels
-@gutter: 24; // The gutter-width of your grid in pixels
-
-
-//
-// Column-widths in variables, in ems
-//
-
- @1cols: ( 1 * (@column + @gutter) - @gutter) / @em; @1col: @1cols;
- @2cols: ( 2 * (@column + @gutter) - @gutter) / @em;
- @3cols: ( 3 * (@column + @gutter) - @gutter) / @em;
- @4cols: ( 4 * (@column + @gutter) - @gutter) / @em;
- @5cols: ( 5 * (@column + @gutter) - @gutter) / @em;
- @6cols: ( 6 * (@column + @gutter) - @gutter) / @em;
- @7cols: ( 7 * (@column + @gutter) - @gutter) / @em;
- @8cols: ( 8 * (@column + @gutter) - @gutter) / @em;
- @9cols: ( 9 * (@column + @gutter) - @gutter) / @em;
-@10cols: (10 * (@column + @gutter) - @gutter) / @em;
-@11cols: (11 * (@column + @gutter) - @gutter) / @em;
-@12cols: (12 * (@column + @gutter) - @gutter) / @em;
-@13cols: (13 * (@column + @gutter) - @gutter) / @em;
-@14cols: (14 * (@column + @gutter) - @gutter) / @em;
-@15cols: (15 * (@column + @gutter) - @gutter) / @em;
-@16cols: (16 * (@column + @gutter) - @gutter) / @em;
-
-
-//
-// Column-widths in a function, in ems
-//
-
-.width (@cols:1) {
- width: (@cols * (@column + @gutter) - @gutter) / @em;
-}
-
-
-/*
- Margin, padding, and border resets
- except for form elements
-*/
-
-body, div,
-h1, h2, h3, h4, h5, h6,
-p, blockquote, pre, dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend, th, td,
-article, aside, figure, footer, header, hgroup, menu, nav, section {
- margin: 0;
- padding: 0;
- border: 0;
-}
-
-
-/*
- Consistency fixes
- adopted from http://necolas.github.com/normalize.css/
-*/
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, nav, section, audio, canvas, video {
- display: block;
-}
-
-html {
- height: 100%;
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
-}
-
- body {min-height: 100%; font-size: 100%;}
-
-sub, sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
-
- sup {top: -0.5em;}
- sub {bottom: -0.25em;}
-
-pre {
- white-space: pre;
- white-space: pre-wrap;
- word-wrap: break-word;
-}
-
-b, strong {font-weight: bold;}
-abbr[title] {border-bottom: 1px dotted;}
-
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-a img, img {
- -ms-interpolation-mode: bicubic;
- border: 0;
-}
-
-input, textarea, button, select {
- margin: 0;
- font-size: 100%;
- line-height: normal;
- vertical-align: baseline;
-}
-
- button,
- html input[type="button"],
- input[type="reset"],
- input[type="submit"] {
- cursor: pointer;
- -webkit-appearance: button;
- }
-
- input[type="checkbox"],
- input[type="radio"] {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -o-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
- }
-
- textarea {overflow: auto;}
-
-
-/*
- These are easy to forget
-*/
-
-::selection {
- background: red;
- color: white;
-}
-::-moz-selection {
- background: red;
- color: white;
-}
-
-img::selection {
- background: transparent;
-}
-img::-moz-selection {
- background: transparent;
-}
-
-body {
- -webkit-tap-highlight-color: rgba(255,0,0, 0.62);
-}
-
-
View
18 media/marketplace-experiments/css/header.less
@@ -1,18 +0,0 @@
-@import 'lib';
-
-#site-header {
- .border-box;
- overflow: hidden;
- background: @darkgray;
- color: #fff;
- padding: 8px;
- width: 100%;
- section {
- .width(10);
- margin: 0 auto;
- }
- h1 {
- font-size: 20px;
- font-weight: 300;
- }
-}
View
142 media/marketplace-experiments/css/lib.less
@@ -1,142 +0,0 @@
-// Columnar layout system.
-// Adaped from Frameless by Joni Korpi <http://framelessgrid.com/>
-// licensed under CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
-
-@column: 72; // The column-width of your grid in pixels
-@gutter: 36; // The gutter-width of your grid in pixels
-@px: 1px; // Multiply by this to make a number in px.
-
-.width(@cols:1) {
- width: (@cols * (@column + @gutter) - @gutter) * @px;
-}
-
-//Breakpoints
-@3col: 440px;
-@4col: 720px;
-@7col: 1024px;
-
-
-// Colors
-@gray: #888;
-@darkgray: #333;
-@text: @darkgray;
-
-@green: #090;
-
-
-
-// Font Stacks
-@sans: "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-
-// Mixins
-.border-radius(@radius) {
- -webkit-border-radius: @radius;
- -moz-border-radius: @radius;
- -ms-border-radius: @radius;
- -o-border-radius: @radius;
- border-radius: @radius;
-}
-
-.transform(@tform) {
- -webkit-transform: @tform;
- -moz-transform: @tform;
- -ms-transform: @tform;
- -o-transform: @tform;
- transform: @tform;
-}
-
-.transition(@property) {
- -moz-transition: @property;
- -webkit-transition: @property;
- transition: @property;
-}
-
-.transition-property(@property) {
- -moz-transition-property: @property;
- -webkit-transition-property: @property;
- transition-property: @property;
-}
-
-.transition-duration(@duration:2s) {
- -moz-transition-duration: @duration;
- -webkit-transition-duration: @duration;
- transition-duration: @duration;
-}
-
-.background-size(@size) {
- -moz-background-size: @size;
- -wekbkit-background-size: @size;
- background-size: @size;
-}
-.background-size(@size, @size2) {
- -moz-background-size: @size, @size2;
- -wekbkit-background-size: @size, @size2;
- background-size: @size, @size2;
-}
-
-.box-shadow(@shadow) {
- box-shadow: @shadow;
- -moz-box-shadow: @shadow;
- -webkit-box-shadow: @shadow;
-}
-.box-shadow(@shadow, @shadow2) {
- box-shadow: @shadow, @shadow2;
- -moz-box-shadow: @shadow, @shadow2;
- -webkit-box-shadow: @shadow, @shadow2;
-}
-.box-shadow(@shadow, @shadow2, @shadow3) {
- box-shadow: @shadow, @shadow2, @shadow3;
- -moz-box-shadow: @shadow, @shadow2, @shadow3;
- -webkit-box-shadow: @shadow, @shadow2, @shadow3;
-}
-
-.text-columns(@count, @gap: 1em) {
- column-count: @count;
- -moz-column-count: @count;
- -webkit-column-count: @count;
- column-gap: @gap;
- -moz-column-gap: @gap;
- -webkit-column-gap: @gap;
-}
-
-.border-box() {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-.ellipsis() {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.gradient-two-color(@color1, @color2) {
- background-color: @color2;
- background-image: -webkit-gradient(linear, left bottom, left top, from(@color1), to(@color2));
- background-image: linear-gradient(@color1, @color2);
- background-image: -moz-linear-gradient(@color1, @color2);
- background-image: -webkit-linear-gradient(@color1, @color2);
-}
-
-// Vertical sprite
-.vsprite(@url, @pos, @spacing, @offset:0) {
- background: ~'url(@{url}) no-repeat';
- background-position: 0 (@spacing * @pos * -1 + @offset) + 0px;
-}
-.vsprite-pos(@pos, @spacing, @offset:0) {
- background-position: 0 (@spacing * @pos * -1 + @offset) + 0px;
-}
-.vsprite-pos-right(@pos, @spacing, @offset:0) {
- background-position: right (@spacing * @pos * -1 + @offset) + 0px;
-}
-
-// Horizontal sprite
-.hsprite(@url, @pos, @spacing, @offset:0) {
- background: ~'url(@{url}) no-repeat';
- background-position: (@spacing * @pos * -1 + @offset) + 0px 0;
-}
-.hsprite-pos(@pos, @spacing, @offset:0) {
- background-position: (@spacing * @pos * -1 + @offset) + 0px 0;
-}
View
530 media/marketplace-experiments/css/reset.less
@@ -1,530 +0,0 @@
-/*! normalize.css 2012-02-07T12:37 UTC - http://github.com/necolas/normalize.css */
-
-/* =============================================================================
- HTML5 display definitions
- ========================================================================== */
-
-/*
- * Corrects block display not defined in IE6/7/8/9 & FF3
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section,
-summary {
- display: block;
-}
-
-/*
- * Corrects inline-block display not defined in IE6/7/8/9 & FF3
- */
-
-audio,
-canvas,
-video {
- display: inline-block;
- *display: inline;
- *zoom: 1;
-}
-
-/*
- * Prevents modern browsers from displaying 'audio' without controls
- */
-
-audio:not([controls]) {
- display: none;
-}
-
-/*
- * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4
- * Known issue: no IE6 support
- */
-
-[hidden] {
- display: none;
-}
-
-
-/* =============================================================================
- Base
- ========================================================================== */
-
-/*
- * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
- * http://clagnut.com/blog/348/#c790
- * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom
- * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
- */
-
-html {
- font-size: 100%; /* 1 */
- -webkit-text-size-adjust: 100%; /* 2 */
- -ms-text-size-adjust: 100%; /* 2 */
-}
-
-/*
- * Addresses font-family inconsistency between 'textarea' and other form elements.
- */
-
-html,
-button,
-input,
-select,
-textarea {
- font-family: sans-serif;
-}
-
-/*
- * Addresses margins handled incorrectly in IE6/7
- */
-
-body {
- margin: 0;
-}
-
-
-/* =============================================================================
- Links
- ========================================================================== */
-
-/*
- * Addresses outline displayed oddly in Chrome
- */
-
-a:focus {
- outline: thin dotted;
-}
-
-/*
- * Improves readability when focused and also mouse hovered in all browsers
- * people.opera.com/patrickl/experiments/keyboard/test
- */
-
-a:hover,
-a:active {
- outline: 0;
-}
-
-
-/* =============================================================================
- Typography
- ========================================================================== */
-
-/*
- * Addresses font sizes and margins set differently in IE6/7
- * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5
- */
-
-h1 {
- font-size: 2em;
- margin: 0.67em 0;
-}
-
-h2 {
- font-size: 1.5em;
- margin: 0.83em 0;
-}
-
-h3 {
- font-size: 1.17em;
- margin: 1em 0;
-}
-
-h4 {
- font-size: 1em;
- margin: 1.33em 0;
-}
-
-h5 {
- font-size: 0.83em;
- margin: 1.67em 0;
-}
-
-h6 {
- font-size: 0.75em;
- margin: 2.33em 0;
-}
-
-/*
- * Addresses styling not present in IE7/8/9, S5, Chrome
- */
-
-abbr[title] {
- border-bottom: 1px dotted;
-}
-
-/*
- * Addresses style set to 'bolder' in FF3+, S4/5, Chrome
-*/
-
-b,
-strong {
- font-weight: bold;
-}
-
-blockquote {
- margin: 1em 40px;
-}
-
-/*
- * Addresses styling not present in S5, Chrome
- */
-
-dfn {
- font-style: italic;
-}
-
-/*
- * Addresses styling not present in IE6/7/8/9
- */
-
-mark {
- background: #ff0;
- color: #000;
-}
-
-/*
- * Addresses margins set differently in IE6/7
- */
-
-p,
-pre {
- margin: 1em 0;
-}
-
-/*
- * Corrects font family set oddly in IE6, S4/5, Chrome
- * en.wikipedia.org/wiki/User:Davidgothberg/Test59
- */
-
-pre,
-code,
-kbd,
-samp {
- font-family: monospace, serif;
- _font-family: 'courier new', monospace;
- font-size: 1em;
-}
-
-/*
- * Improves readability of pre-formatted text in all browsers
- */
-
-pre {
- white-space: pre;
- white-space: pre-wrap;
- word-wrap: break-word;
-}
-
-/*
- * 1. Addresses CSS quotes not supported in IE6/7
- * 2. Addresses quote property not supported in S4
- */
-
-/* 1 */
-
-q {
- quotes: none;
-}
-
-/* 2 */
-
-q:before,
-q:after {
- content: '';
- content: none;
-}
-
-small {
- font-size: 75%;
-}
-
-/*
- * Prevents sub and sup affecting line-height in all browsers
- * gist.github.com/413930
- */
-
-sub,
-sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
-
-sup {
- top: -0.5em;
-}
-
-sub {
- bottom: -0.25em;
-}
-
-
-/* =============================================================================
- Lists
- ========================================================================== */
-
-/*
- * Addresses margins set differently in IE6/7
- */
-
-dl,
-menu,
-ol,
-ul {
- margin: 1em 0;
-}
-
-dd {
- margin: 0 0 0 40px;
-}
-
-/*
- * Addresses paddings set differently in IE6/7
- */
-
-menu,
-ol,
-ul {
- padding: 0 0 0 40px;
-}
-
-/*
- * Corrects list images handled incorrectly in IE7
- */
-
-nav ul,
-nav ol {
- list-style: none;
- list-style-image: none;
-}
-
-
-/* =============================================================================
- Embedded content
- ========================================================================== */
-
-/*
- * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3
- * 2. Improves image quality when scaled in IE7
- * code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
- */
-
-img {
- border: 0; /* 1 */
- -ms-interpolation-mode: bicubic; /* 2 */
-}
-
-/*
- * Corrects overflow displayed oddly in IE9
- */
-
-svg:not(:root) {
- overflow: hidden;
-}
-
-
-/* =============================================================================
- Figures
- ========================================================================== */
-
-/*
- * Addresses margin not present in IE6/7/8/9, S5, O11
- */
-
-figure {
- margin: 0;
-}
-
-
-/* =============================================================================
- Forms
- ========================================================================== */
-
-/*
- * Corrects margin displayed oddly in IE6/7
- */
-
-form {
- margin: 0;
-}
-
-/*
- * Define consistent border, margin, and padding
- */
-
-fieldset {
- border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
-}
-
-/*
- * 1. Corrects color not being inherited in IE6/7/8/9
- * 2. Corrects text not wrapping in FF3
- * 3. Corrects alignment displayed oddly in IE6/7
- */
-
-legend {
- border: 0; /* 1 */
- padding: 0;
- white-space: normal; /* 2 */
- *margin-left: -7px; /* 3 */
-}
-
-/*
- * 1. Corrects font size not being inherited in all browsers
- * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome
- * 3. Improves appearance and consistency in all browsers
- */
-
-button,
-input,
-select,
-textarea {
- font-size: 100%; /* 1 */
- margin: 0; /* 2 */
- vertical-align: baseline; /* 3 */
- *vertical-align: middle; /* 3 */
-}
-
-/*
- * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
- */
-
-button,
-input {
- line-height: normal; /* 1 */
-}
-
-/*
- * 1. Improves usability and consistency of cursor style between image-type 'input' and others
- * 2. Corrects inability to style clickable 'input' types in iOS
- * 3. Removes inner spacing in IE7 without affecting normal text inputs
- * Known issue: inner spacing remains in IE6
- */
-
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
- cursor: pointer; /* 1 */
- -webkit-appearance: button; /* 2 */
- *overflow: visible; /* 3 */
-}
-
-/*
- * Re-set default cursor for disabled elements
- */
-
-button[disabled],
-input[disabled] {
- cursor: default;
-}
-
-/*
- * 1. Addresses box sizing set to content-box in IE8/9
- * 2. Removes excess padding in IE8/9
- * 3. Removes excess padding in IE7
- Known issue: excess padding remains in IE6
- */
-
-input[type="checkbox"],
-input[type="radio"] {
- box-sizing: border-box; /* 1 */
- padding: 0; /* 2 */
- *height: 13px; /* 3 */
- *width: 13px; /* 3 */
-}
-
-/*
- * 1. Addresses appearance set to searchfield in S5, Chrome
- * 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof)
- */
-
-input[type="search"] {
- -webkit-appearance: textfield; /* 1 */
- -moz-box-sizing: content-box;
- -webkit-box-sizing: content-box; /* 2 */
- box-sizing: content-box;
-}
-
-/*
- * Removes inner padding and search cancel button in S5, Chrome on OS X
- */
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
- -webkit-appearance: none;
-}
-
-/*
- * Removes inner padding and border in FF3+
- * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
- border: 0;
- padding: 0;
-}
-
-/*
- * 1. Removes default vertical scrollbar in IE6/7/8/9
- * 2. Improves readability and alignment in all browsers
- */
-
-textarea {
- overflow: auto; /* 1 */
- vertical-align: top; /* 2 */
-}
-
-
-/* =============================================================================
- Tables
- ========================================================================== */
-
-/*
- * Remove most spacing between table cells
- */
-
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
- margin: 0;
-}
-
-/*
- These are easy to forget
-*/
-
-::selection {
- background: red;
- color: white;
-}
-::-moz-selection {
- background: red;
- color: white;
-}
-
-img::selection {
- background: transparent;
-}
-img::-moz-selection {
- background: transparent;
-}
-
-body {
- -webkit-tap-highlight-color: rgba(255,0,0, 0.62);
-}
View
70 media/marketplace-experiments/css/site.less
@@ -1,70 +0,0 @@
-@import 'lib';
-
-body {
- font-family: @sans;
- color: @text;
- overflow-x: hidden;
- background: url('/media/marketplace-experiments/gridbg.png') center center;
- &.cols-even {
- background: url('/media/marketplace-experiments/gridbg-even.png') center center;
- }
-}
-
-#page {
- .width(10);
- margin: 0 auto;
- .border-box;
- &:after {
- content: '';
- display: block;
- clear: both;
- }
-}
-
-// 7 columns (portrait tablet)
-@media (max-width: @7col) {
- #page {
- .width(7);
- }
-}
-
-// 4 columns (landscape smartphone)
-@media (max-width: @4col) {
- #page {
- .width(4);
- }
-}
-
-// 3 columns (portrait smartphone)
-@media (max-width: @3col) {
- #page {
- .width(3);
- }
-}
-
-.row {
- clear: both;
-}
-
-.stack-left {
- float: left;
-}
-.stack-right {
- float: right;
-}
-.html-rtl {
- .stack-left {
- float: right;
- }
- .stack-right {
- float: left;
- }
-}
-
-// TODO potch: Belongs with the "collapsible" widget.
-.more {
- display: none;
-}
-.more.expand {
- display: block;
-}
View
42 media/marketplace-experiments/css/slider.less
@@ -1,42 +0,0 @@
-@import 'lib';
-
-.slider {
- display: block;
- position: relative;
- overflow: hidden;
- margin: 1em 0;
- ul {
- white-space: nowrap;
- margin: 0;
- padding: 0;
- -webkit-transition: .5s -webkit-transform ease-out;
- -moz-transition: .5s -moz-transform ease-out;
- &.panning {
- -webkit-transition: none;
- -moz-transition: none;
- }
- }
- li {
- list-style-type: none;
- display: inline-block;
- margin: 0;
- padding: 0;
- a {
- display: block;
- width: 200px;
- height: 150px;
- background: white;
- border: 1px solid black;
- padding: 8px;
- margin-right: 16px;
- img {
- display: block;
- margin: auto;
- }
- }
- }
-}
-
-.previews.slider {
- width: 100%;
-}
View
BIN  media/marketplace-experiments/gridbg-even.png
Deleted file not rendered
View
BIN  media/marketplace-experiments/gridbg.png
Deleted file not rendered
View
12 mkt/asset_bundles.py
@@ -141,14 +141,6 @@
'mkt/stats': (
'css/mkt/stats.less',
),
- 'marketplace-experiments': (
- 'marketplace-experiments/css/reset.less',
- 'marketplace-experiments/css/site.less',
- 'marketplace-experiments/css/header.less',
- 'marketplace-experiments/css/detail.less',
- 'marketplace-experiments/css/buttons.less',
- 'marketplace-experiments/css/slider.less',
- ),
}
JS = {
@@ -254,8 +246,4 @@
'mkt/in-app-payments': (
'js/mkt/inapp_payments.js',
),
- 'marketplace-experiments': (
- 'js/marketplace-experiments/jquery-1.7.1.min.js',
- 'js/marketplace-experiments/slider.js',
- ),
}
View
0  mkt/experiments/__init__.py
No changes.
View
3  mkt/experiments/context_processors.py
@@ -1,3 +0,0 @@
-def fragment(request):
- is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
- return {'VIEW_FRAGMENT': is_ajax}
View
11 mkt/experiments/urls.py
@@ -1,11 +0,0 @@
-from django.conf.urls.defaults import patterns, url
-
-from . import views
-
-from jingo.views import direct_to_template
-
-APP_SLUG = r"""(?P<app_slug>[^/<>"']+)"""
-
-urlpatterns = patterns('',
- url('^$', views.detail, name='mkt.experiments'),
-)
View
24 mkt/experiments/views.py
@@ -1,24 +0,0 @@
-import jingo
-import jinja2
-
-from addons.models import Addon
-from addons.decorators import (addon_view_factory, can_be_purchased,
- has_purchased, has_not_purchased)
-
-from reviews.forms import ReviewForm
-from reviews.models import Review, GroupedRating
-
-
-addon_view = addon_view_factory(qs=Addon.objects.valid)
-
-@addon_view
-def detail(request, addon):
- """Product details page."""
-
- ctx = {
- 'addon': addon,
- 'review_form': ReviewForm(),
- 'reviews': Review.objects.latest().filter(addon=addon),
- }
-
- return jingo.render(request, 'marketplace-experiments/detail.html', ctx)
View
4 mkt/settings.py
@@ -43,7 +43,6 @@
'mkt.browse',
'mkt.detail',
'mkt.developers',
- 'mkt.experiments',
'mkt.home',
'mkt.inapp_pay',
'mkt.purchase',
@@ -169,9 +168,6 @@
ADDON_ICONS_DEFAULT_PATH = os.path.join(MEDIA_ROOT, 'img/hub')
ADDON_ICONS_DEFAULT_URL = MEDIA_URL + '/img/hub'
-# Feature flags.
-POTCH_MARKETPLACE_EXPERIMENTS = False
-
# JWT identifier for this marketplace.
# This is used for in-app payments in two ways.
# 1. app must send JWTs with aud (the audience) set to this exact value.
View
1  mkt/templates/mkt/home.html
@@ -1 +0,0 @@
-{% extends 'marketplace-experiments/base.html' %}
View
8 mkt/urls.py
@@ -98,14 +98,6 @@
('', include('apps.amo.urls')),
)
-
-# Marketplace UI Experiments.
-if getattr(settings, 'POTCH_MARKETPLACE_EXPERIMENTS', False):
- urlpatterns += patterns('',
- ('^marketplace-experiments/', include('mkt.experiments.urls'))
- )
-
-
if settings.TEMPLATE_DEBUG:
# Remove leading and trailing slashes so the regex matches.
media_url = settings.MEDIA_URL.lstrip('/').rstrip('/')
View
113 templates/marketplace-experiments/base.html
@@ -1,113 +0,0 @@
-{% if VIEW_FRAGMENT %}
- {% extends 'marketplace-experiments/fragment.html' %}
-{% endif %}
-<!DOCTYPE html>
-<html lang="{{ LANG }}" dir="{{ DIR }}">
- <head>
- <meta charset="utf-8">
- {% if not settings.ENGAGE_ROBOTS %}
- <meta name="robots" content="noindex">
- {% endif %}
- <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
- {% block extrameta %}{% endblock %}
- <title>{% block title %}{{ _('Mozilla Marketplace') }}{% endblock %}</title>
-
- <link rel="shortcut icon" type="image/x-icon"
- href="{{ MEDIA_URL}}img/favicon.ico">
-
- {# L10n: {0} is an application, like Firefox. #}
- <link title="{{ _('{0} Add-ons')|f(APP.pretty) }}"
- rel="search" type="application/opensearchdescription+xml"
- href="{{ url('amo.opensearch') }}" />
-
- {% block site_css %}
- {{ css('marketplace-experiments') }}
- <!--[if lt IE 9]>
- <script src="{{ media('js/lib/iepp.min.js') }}"></script>
- <![endif]-->
- <!--[if lte IE 9]>
- <link rel="stylesheet" href="{{ media('css/legacy/ie9.css') }}">
- <![endif]-->
- {% endblock %}
-
- {% block extrahead %}{% endblock %}
-
- {% block debug %}
- {% include "mobile/head_debug.html" %}
- {% endblock %}
-
- {% if request.user.is_authenticated() %}
- <meta name="csrf" content="{{ csrf_token }}">
- {% endif %}
- </head>
- <body class="html-{{ DIR }} {% block bodyclass %}{% endblock %}"
- data-anonymous="{{ (not request.user.is_authenticated())|json }}"
- data-readonly="{{ settings.READ_ONLY|json }}"
- data-media-url="{{ MEDIA_URL }}"
- {% if waffle.switch('marketplace') and request.amo_user %}
- data-purchases="{{ request.amo_user.purchase_ids()|join(",") }}"
- {% endif %}
- data-collect-timings="{{ url('amo.timing.record') }}:{{ collect_timings_percent }}"
- {% block bodyattrs %}{% endblock %}>
-
- {% block siteheader %}
- {% include 'marketplace-experiments/header.html' %}
- {% endblock %}
-
- <div id="page" class="c">
- {% block content %}
- {% endblock %}
- </div>
-
- <footer>
- </footer>
-
- {# js #}
- {% block site_js %}
- {% if settings.APP_PREVIEW %}
- <script src="https://myapps.mozillalabs.com/jsapi/include.js"></script>
- {% endif %}
- {% if waffle.switch('browserid-login') %}
- <script async defer src="https://browserid.org/include.js"></script>
- {% endif %}
- {{ js('marketplace-experiments') }}
- <script async defer src="{{ settings.PAYPAL_JS_URL }}"></script>
- <script>
- (function() {
- var it = false;
- function resizeHandler() {
- clearTimeout(it);
- it = setTimeout(trigger, 200);
- }
- function trigger() {
- $(window).trigger('saferesize');
- }
- window.addEventListener('resize', resizeHandler, false);
- })();
- (function() {
- var t = 'init',
- b = document.body;
- if (!b.classList) return;
- d = document.createElement('div');
- b.appendChild(d);
- d.setAttribute('style', 'position:fixed;bottom:0;left:0;font:normal 11px monospace;background:rgba(0,0,0,.8);padding:4px;color:#fff;');
- window.dbg = function(m) {
- d.innerHTML = m;
- };
- function calcColumns() {
- var w = b.clientWidth;
- c = ~~((w+36)/108);
- if (c % 2) {
- b.classList.remove('cols-even');
- } else {
- b.classList.add('cols-even');
- }
- d.innerHTML = "viewport:" + w + " cols:" + c;
- }
- $(window).bind('saferesize', calcColumns);
- calcColumns();
- })();
- </script>
- {% endblock %}
- </body>
-</html>
View
56 templates/marketplace-experiments/detail.html
@@ -1,56 +0,0 @@
-{% extends 'marketplace-experiments/base.html' %}
-
-{% block content %}
- <section class="row product-details">
- <div class="app-icon">
- <img alt="" src="{{ addon.get_icon_url(64) }}" />
- </div>
- <div class="app-info">
- <div class="vitals">
- <h2>{{ addon.name }}</h2>
- <h3 class="authors">by {{ users_list(addon.listed_authors) }}</h3>
- <p class="ratings">
- <span class="rating positive">1876</span>
- <span class="rating negative">485</span>
- </p>
- </div>
- <p class="actions">
- <a id="purchase" class="button prominent large install">FREE</a>
- <a id="share" class="button large">Share</a>
- </p>
- <div class="description">
- <p class="prose">{{ addon.summary }}</p>
- <div class="more">
- {{ addon.description }}
- </div>
- <a class="button show-more stack-right" href="#">Read More &raquo;</a>
- </div>
- </div>
- <div class="compatibility">
- <p>
- Designed for:
- </p>
- <ul class="unstyled compatibility-list">
- <li><span class="label">Phones</span></li>
- <li><span class="label">Tablets</span></li>
- </ul>
- </div>
- </section>
-
- {% if addon.type != amo.ADDON_PERSONA %}
- {% if addon.all_previews|length > 0 %}
- <section class="previews slider row">
- <ul>
- {%- for preview in addon.all_previews -%}
- <li>
- <a class="screenshot thumbnail" rel="jquery-lightbox"
- href="{{ preview.image_url }}" title="{{ preview.caption }}">
- <img src="{{ preview.thumbnail_url }}">
- </a>
- </li>
- {%- endfor -%}
- </ul>
- </section>
- {% endif %}
- {% endif %}
-{% endblock %}
View
3  templates/marketplace-experiments/fragment.html
@@ -1,3 +0,0 @@
-<!-- fragment -->
-{% block content %}
-{% endblock %}
View
8 templates/marketplace-experiments/header.html
@@ -1,8 +0,0 @@
-<header id="site-header">
- <section>
- <h1>{{ loc('Mozilla Marketplace') }}</h1>
- <nav>
- <a class="back"></a>
- </nav>
- </section>
-</header>
View
1  templates/marketplace-experiments/home.html
@@ -1 +0,0 @@
-{% extends 'marketplace-experiments/base.html' %}
Please sign in to comment.
Something went wrong with that request. Please try again.